[cases] error handling and feedback improvements

.gitignore

@@ -7,6 +7,7 @@ node_modules/
 .expo/
 dist/
 web-build/
+ios/
 
 # Native
 *.orig.*

package.json

@@ -46,6 +46,7 @@
     "react-native-elements": "^3.4.3",
     "react-native-gesture-handler": "~2.16.1",
     "react-native-otp-textinput": "^1.1.5",
+    "react-native-paper": "^5.12.3",
     "react-native-safe-area-context": "4.10.1",
     "react-native-screens": "3.31.1",
     "react-native-svg": "15.2.0",

src/Components/CaseSummaryCard/styles.ts

@@ -14,6 +14,7 @@ export default StyleSheet.create({
     justifyContent: 'space-between',
     borderTopRightRadius: 4,
     borderTopLeftRadius: 4,
+    backgroundColor: colors.lightGrey,
   },
   infoContainer: {
     flexDirection: 'column',

src/Components/CaseSummaryContent/styles.ts

@@ -18,6 +18,7 @@ export default StyleSheet.create({
     borderRadius: 5,
     marginTop: 30,
     marginBottom: 20,
+    backgroundColor: colors.lightGrey,
   },
   summaryContainer: {
     width: '100%',

src/Components/FormsCard/FormsCard.tsx

@@ -14,13 +14,9 @@ export default function FormsCard(caseData: Case) {
   const [featuredForm, setFeaturedForm] = useState<Form>();
 
   const getForm = async () => {
-    const formData = await getFeaturedForm(
-      caseData.id,
-      caseData.featuredFormName,
-    );
-    if (formData) {
-      setFeaturedForm(formData);
-    }
+    await getFeaturedForm(caseData.id, caseData.featuredFormName)
+      .then(formData => setFeaturedForm(formData))
+      .catch(response => console.warn(response));
   };
 
   useEffect(() => {

src/Components/ScreenLoadingComponent/ScreenLoadingComponent.tsx

@@ -0,0 +1,42 @@
+import { useEffect, useState } from 'react';
+import { View, Text } from 'react-native';
+import { ActivityIndicator } from 'react-native-paper';
+
+import styles from './styles';
+import { colors } from '../../styles/colors';
+import { fonts } from '../../styles/fonts';
+
+export default function ScreenLoadingComponent() {
+  const [loadingPromptExists, setLoadingPromptExists] =
+    useState<boolean>(false);
+  const [timeoutReached, setTimeoutReached] = useState<boolean>(false);
+
+  useEffect(() => {
+    setTimeout(() => {
+      setLoadingPromptExists(true);
+      setTimeout(() => {
+        setTimeoutReached(true);
+      }, 10000);
+    }, 5000);
+  }, []);
+
+  return (
+    <View style={styles.container}>
+      <ActivityIndicator size="small" color={colors.midRed} />
+      {loadingPromptExists && (
+        <View>
+          {!timeoutReached ? (
+            <Text style={fonts.body}>This is taking longer than usual...</Text>
+          ) : (
+            <Text style={fonts.body}>
+              There seems to be an issue connecting with Impact Fund servers...{' '}
+              {'\n'}
+              {'\n'}
+              Please check your internet connection or try again later.
+            </Text>
+          )}
+        </View>
+      )}
+    </View>
+  );
+}

src/Components/ScreenLoadingComponent/styles.ts

@@ -0,0 +1,10 @@
+import { StyleSheet } from 'react-native';
+
+export default StyleSheet.create({
+  container: {
+    width: 300,
+    alignItems: 'center',
+    marginTop: 20,
+    rowGap: 20,
+  },
+});

src/app/(BottomTabNavigation)/AllCases/CaseScreen/[caseUid].tsx

@@ -1,4 +1,4 @@
-import { useLocalSearchParams, useNavigation } from 'expo-router';
+import { useLocalSearchParams } from 'expo-router';
 import React, { useEffect, useState } from 'react';
 import { View, ScrollView, Text } from 'react-native';
 
@@ -9,50 +9,45 @@ import ClaimStatusBar from '../../../../Components/ClaimStatusBar/ClaimStatusBar
 import EducationalBar from '../../../../Components/EducationalBar/EducationalBar';
 import EligibilityCard from '../../../../Components/EligibilityCard/EligibilityCard';
 import FormsCard from '../../../../Components/FormsCard/FormsCard';
+import ScreenLoadingComponent from '../../../../Components/ScreenLoadingComponent/ScreenLoadingComponent';
 import StatusUpdatesBar from '../../../../Components/StatusUpdatesBar/StatusUpdatesBar';
+import { useCaseContext } from '../../../../context/CaseContext';
 import { fonts } from '../../../../styles/fonts';
 import { device } from '../../../../styles/global';
-import { getCaseStatus, getCaseById } from '../../../../supabase/queries/cases';
-import { Case, Eligibility } from '../../../../types/types';
+import { fullStopErrorHandler } from '../../../../supabase/queries/auth';
+import { getCaseById } from '../../../../supabase/queries/cases';
+import { Case, ClaimStatus } from '../../../../types/types';
 
-function CaseScreen() {
+export default function CaseScreen() {
   const { caseUid } = useLocalSearchParams<{ caseUid: string }>();
-  const [status, setStatus] = useState<Eligibility>();
+  const [status, setStatus] = useState<ClaimStatus>();
   const [caseData, setCaseData] = useState<Case>();
-  const [isLoading, setIsLoading] = useState<boolean>(true);
-  const navigation = useNavigation();
 
-  const getCase = async (uid: string) => {
-    const caseData = await getCaseById(uid);
-    setCaseData(caseData);
-    setIsLoading(false);
+  const { getClaimStatus } = useCaseContext();
+
+  const getCase = async (caseUid: string) => {
+    await getCaseById(caseUid)
+      .then(caseData => setCaseData(caseData))
+      .catch(response => fullStopErrorHandler(response));
   };
 
-  const getStatus = async (uid: string) => {
-    const caseStatus = await getCaseStatus(uid);
-    setStatus(caseStatus);
+  const getStatus = async (caseUid: string) => {
+    await getClaimStatus(caseUid)
+      .then(claimStatus => setStatus(claimStatus))
+      .catch(response => fullStopErrorHandler(response));
   };
 
   useEffect(() => {
-    if (caseUid !== undefined) {
+    if (caseUid) {
       getCase(caseUid);
+      getStatus(caseUid);
     }
   }, []);
 
-  useEffect(() => {
-    navigation.addListener('focus', async () => {
-      setIsLoading(true);
-      if (caseUid !== undefined) {
-        await getStatus(caseUid);
-      }
-      setIsLoading(false);
-    });
-  }, [navigation]);
-
   return (
     <View style={device.safeArea}>
-      {isLoading || caseData === undefined ? (
-        <Text>Loading...</Text>
+      {!caseData || !status ? (
+        <ScreenLoadingComponent />
       ) : (
         <ScrollView
           style={styles.outerScroll}
@@ -65,18 +60,18 @@ function CaseScreen() {
             </Text>
           </View>
 
-          {status === Eligibility.ELIGIBLE && (
+          {status === ClaimStatus.ELIGIBLE && (
             <EligibilityCard caseUid={caseData.id} />
           )}
 
-          {status === Eligibility.CLAIM_FILED && (
+          {status === ClaimStatus.CLAIM_FILED && (
             <ClaimStatusBar status="Claim Filed" />
           )}
 
           <CaseSummaryCard {...caseData} />
 
-          {(status === Eligibility.INELIGIBLE ||
-            status === Eligibility.UNDETERMINED) && (
+          {(status === ClaimStatus.INELIGIBLE ||
+            status === ClaimStatus.UNDETERMINED) && (
             <CheckEligibilityButton caseUid={caseData.id} />
           )}
           <StatusUpdatesBar
@@ -90,5 +85,3 @@ function CaseScreen() {
     </View>
   );
 }
-
-export default CaseScreen;

src/app/(BottomTabNavigation)/AllCases/CaseSummaryScreen/[caseUid].tsx

@@ -1,11 +1,13 @@
 import { useLocalSearchParams } from 'expo-router';
 import React, { useState, useEffect } from 'react';
-import { View, Text } from 'react-native';
+import { View } from 'react-native';
 
 import styles from './styles';
 import CaseSummaryContent from '../../../../Components/CaseSummaryContent/CaseSummaryContent';
 import ExternalSiteLink from '../../../../Components/ExternalSiteLink/ExternalSiteLink';
+import ScreenLoadingComponent from '../../../../Components/ScreenLoadingComponent/ScreenLoadingComponent';
 import { device } from '../../../../styles/global';
+import { fullStopErrorHandler } from '../../../../supabase/queries/auth';
 import { getCaseById } from '../../../../supabase/queries/cases';
 import { Case } from '../../../../types/types';
 
@@ -14,20 +16,21 @@ export default function CaseSummaryScreen() {
   const [caseData, setCaseData] = useState<Case>();
 
   const getCase = async (uid: string) => {
-    const caseData = await getCaseById(uid);
-    setCaseData(caseData);
+    await getCaseById(uid)
+      .then(caseData => setCaseData(caseData))
+      .catch(response => fullStopErrorHandler(response));
   };
 
   useEffect(() => {
-    if (caseUid !== undefined) {
+    if (caseUid) {
       getCase(caseUid);
     }
   }, []);
 
   return (
     <View style={device.safeArea}>
       {caseData === undefined ? (
-        <Text>Loading...</Text>
+        <ScreenLoadingComponent />
       ) : (
         <>
           <CaseSummaryContent {...caseData} />