UI and text changes

src/components/ConfirmationDialog.js

@@ -28,7 +28,7 @@ const ConfirmationDialog = ({
   handleConfirmation,
   documents,
   loading,
-  concentText = 'Share my documents with the provider for processing my application',
+  consentText = 'Share my documents with the provider for processing my application',
 }) => {
   // Function to call the parent's function
   const sendCloseDialog = () => {
@@ -73,7 +73,7 @@ const ConfirmationDialog = ({
 
             <Dialog.Content style={styles.dialogContent}>
               <Text variant="bodyMedium" style={styles.conformationText}>
-                {concentText}
+                {consentText}
               </Text>
               <ScrollView style={{height: 220}}>
                 {loading ? (

src/components/common/BenefitCard.js

@@ -24,7 +24,7 @@ const BenefitCard = ({item, navigation}) => {
           {item?.title}
         </Text>
         <Text numberOfLines={2} style={styles.subTitle}>
-          {item?.description}
+          {item?.provider_name}
         </Text>
         {/* <Text numberOfLines={2} style={styles.benefitAmount}>
         <Icon source={'currency-inr'} size={16} />

src/components/common/TextInput/Password.js

@@ -30,7 +30,7 @@ const PasswordInput = ({
       secureTextEntry={showPassword}
       right={
         <TextInput.Icon
-          icon={showPassword ? 'eye-off' : 'eye'}
+          icon={showPassword ? 'eye' : 'eye-off'}
           onPress={() => setShowPassword(!showPassword)}
         />
       }

src/components/common/inputs/Searchbar.js

@@ -1,11 +1,14 @@
 import * as React from 'react';
 import {StyleSheet, View, TextInput} from 'react-native';
 import {IconButton} from 'react-native-paper';
-import Icon from 'react-native-vector-icons/MaterialIcons'; // Import the icon library
 
-const Searchbar = ({onSearch}) => {
+const Searchbar = ({onSearch, value}) => {
   const [searchQuery, setSearchQuery] = React.useState('');
 
+  React.useEffect(() => {
+    setSearchQuery(value);
+  }, [value]);
+
   return (
     <View style={styles.Searchcontainer}>
       <View style={styles.searchWrapper}>

src/components/common/layout/SearchHeader.js

@@ -3,10 +3,14 @@ import React from 'react';
 import FilterDialog from '../../FilterDialog';
 import Searchbar from '../inputs/Searchbar';
 
-const SearchHeader = ({onSearch, inputs, onFilter}) => {
+const SearchHeader = ({onSearch, searchValue, inputs, onFilter}) => {
   return (
     <View style={styles.view}>
-      <Searchbar style={styles.searchBar} onSearch={onSearch} />
+      <Searchbar
+        style={styles.searchBar}
+        onSearch={onSearch}
+        value={searchValue}
+      />
       <FilterDialog style={styles.filter} inputs={inputs} onFilter={onFilter} />
     </View>
   );

src/screens/auth/Login.js

@@ -43,7 +43,7 @@ const Login = () => {
     };
 
     if (!username) {
-      setError('Enter Username ');
+      setError('Enter Username');
       clearError();
       return;
     }
@@ -106,7 +106,7 @@ const Login = () => {
       />
       <View>
         <CustomTextInput
-          label={'UserName'}
+          label={'User Name'}
           value={username}
           onChangeText={setUsername}
           marginBottom={25}
@@ -156,7 +156,7 @@ const Login = () => {
         closeDialog={setDialogVisible}
         handleConfirmation={handleCofirmation}
         documents={documents}
-        concentText="Please provide your consent to share the following with Fast Pass"
+        consentText="Please provide your consent to share the following with Fast Pass"
       />
     </View>
   );

src/screens/auth/Splash.js

@@ -33,7 +33,7 @@ const Splash = () => {
           getValue={setSelectedLanguage}
         />
         <Button
-          label="Sign In / Sign Up "
+          label="Sign In / Sign Up With Your E-Wallet"
           padding={2}
           width="92%"
           handleClick={handleLogin}

src/screens/benefits/List.js

@@ -6,7 +6,7 @@ import Layout from '../../components/common/layout/Layout';
 import * as benefitServis from '../../service/benefits';
 import {Gender, Castes, IncomeRange} from '../../constatnt/Constant';
 import BenefitCard from '../../components/common/BenefitCard';
-import {Text} from 'react-native-paper';
+import {Dialog, Portal, Text} from 'react-native-paper';
 import {getTokenData} from '../../service/ayncStorage';
 import {getUser} from '../../service/auth';
 
@@ -19,54 +19,79 @@ const List = () => {
   // const [hasMore] = useState(true);
   // const benefits = data.ubi_network_cache; // data from API
   const [benefits, setBenefits] = useState([]);
+  const [error, setError] = useState();
 
   useEffect(() => {
     const init = async () => {
-      const {sub} = await getTokenData(); // Assuming sub is the user identifier
-      const user = await getUser(sub);
-      const filters = {
-        'social-eligibility': user?.userInfo?.caste,
-        'ann-hh-inc': user?.userInfo?.income,
-        'gender-eligibility': user?.userInfo?.gender,
-      };
-      const newFilter = {};
-      Object.keys(filters).forEach(key => {
-        if (filters[key] && filters[key] !== '') {
-          if (typeof filters[key] === 'string') {
-            newFilter[key] = filters[key].toLowerCase();
-          } else {
-            newFilter[key] = filters[key];
+      try {
+        const {sub} = await getTokenData(); // Assuming sub is the user identifier
+        const user = await getUser(sub);
+        const filters = {
+          'social-eligibility': user?.userInfo?.caste,
+          'ann-hh-inc': user?.userInfo?.income,
+          'gender-eligibility': user?.userInfo?.gender,
+        };
+        const newFilter = {};
+        Object.keys(filters).forEach(key => {
+          if (filters[key] && filters[key] !== '') {
+            if (typeof filters[key] === 'string') {
+              newFilter[key] = filters[key].toLowerCase();
+            } else {
+              newFilter[key] = filters[key];
+            }
           }
-        }
-      });
-      setFilter(newFilter);
-      setInitState('no');
+        });
+        setFilter(newFilter);
+        setInitState('no');
+      } catch (e) {
+        setError(e.message);
+        setInitState('no');
+      }
     };
     init();
   }, []);
-  console.log(loading, initState);
+
   useEffect(() => {
     const init = async () => {
-      if (initState == 'no') {
-        setLoading(true);
-        console.log('hello2');
-        const result = await benefitServis.getAll({
-          filters: {
-            ...filter,
-            'ann-hh-inc': filter?.['ann-hh-inc']
-              ? `0-${filter?.['ann-hh-inc']}`
-              : '',
-          },
-          search,
-        });
-        console.log(result, 'result');
-        setBenefits(result?.data?.ubi_network_cache || []);
+      try {
+        if (initState == 'no') {
+          setLoading(true);
+          const result = await benefitServis.getAll({
+            filters: {
+              ...filter,
+              'ann-hh-inc': filter?.['ann-hh-inc']
+                ? `0-${filter?.['ann-hh-inc']}`
+                : '',
+            },
+            search,
+          });
+          setBenefits(result?.data?.ubi_network_cache);
+          setLoading(false);
+        }
+      } catch (e) {
+        setError(e.message);
         setLoading(false);
       }
     };
     init();
   }, [filter, search, initState]);
 
+  if (error) {
+    return (
+      <Portal>
+        <Dialog visible={!!error} onDismiss={() => setError('')}>
+          <Dialog.Title>Error</Dialog.Title>
+          <Dialog.Content>
+            <Text>{error}</Text>
+          </Dialog.Content>
+          <Dialog.Actions>
+            <Text onPress={() => setError('')}>Close</Text>
+          </Dialog.Actions>
+        </Dialog>
+      </Portal>
+    );
+  }
+
   return (
     <Layout
       loading={loading}

src/screens/benefits/ViewDetails.js

@@ -4,7 +4,7 @@ import CustomButton from '../../components/common/button/Button';
 import ConfirmationDialog from '../../components/ConfirmationDialog';
 import Layout from '../../components/common/layout/Layout';
 import {useNavigation} from '@react-navigation/native';
-import {ActivityIndicator, Icon} from 'react-native-paper';
+import {ActivityIndicator, Dialog, Icon, Portal} from 'react-native-paper';
 import * as benefitServis from '../../service/benefits';
 import WebViewFormExample from '../../components/common/webview/Form';
 import {getTokenData} from '../../service/ayncStorage';
@@ -21,6 +21,7 @@ const ViewDetails = ({route}) => {
   const navigation = useNavigation();
   const [context, setContext] = useState({});
   const [isApplied, setIsApplied] = useState(false);
+  const [error, setError] = useState();
   const handleBack = () => {
     navigation.navigate('BenefitsListing');
   };
@@ -70,7 +71,7 @@ const ViewDetails = ({route}) => {
         }
         setLoading(false);
       } catch (e) {
-        console.log('Error:', e.message);
+        setError('Error:', e.message);
       }
     };
     init();
@@ -89,32 +90,40 @@ const ViewDetails = ({route}) => {
   ];
   const submitConfirm = async submission_id => {
     setLoading(true);
-    const result = await benefitServis.confirmApplication({
-      submission_id,
-      context,
-    });
-    const orderId = result?.data?.responses?.[0]?.message?.order?.id;
-    if (orderId) {
-      const payload = {
-        user_id: authUser?.user_id,
-        benefit_id: id,
-        benefit_provider_id: context?.bpp_id,
-        benefit_provider_uri: context?.bap_uri,
-        external_application_id: orderId,
-        application_name: item?.descriptor?.name,
-        status: 'submitted',
-        application_data: authUser,
-      };
-      try {
+
+    try {
+      const result = await benefitServis.confirmApplication({
+        submission_id,
+        item_id: id,
+        context,
+      });
+      const orderId = result?.data?.responses?.[0]?.message?.order?.id;
+      if (orderId) {
+        const payload = {
+          user_id: authUser?.user_id,
+          benefit_id: id,
+          benefit_provider_id: context?.bpp_id,
+          benefit_provider_uri: context?.bap_uri,
+          external_application_id: orderId,
+          application_name: item?.descriptor?.name,
+          status: 'submitted',
+          application_data: authUser,
+        };
         const appResult = await benefitServis.createApplication(payload);
         if (appResult) {
           setWebFromProp();
           setVisibleDialog({orderId, name: item?.descriptor?.name});
           setLoading(false);
         }
-      } catch (e) {
-        console.log(e.message);
+      } else {
+        setError(
+          'Error while creating application. Please try again later. (Status code 500)',
+        );
+        setLoading(false);
       }
+    } catch (e) {
+      setError('Error:', e.message);
+      setLoading(false);
     }
     setLoading(false);
   };
@@ -131,6 +140,23 @@ const ViewDetails = ({route}) => {
       </View>
     );
   }
+
+  if (error) {
+    return (
+      <Portal>
+        <Dialog visible={!!error} onDismiss={() => setError('')}>
+          <Dialog.Title>Error</Dialog.Title>
+          <Dialog.Content>
+            <Text>{error}</Text>
+          </Dialog.Content>
+          <Dialog.Actions>
+            <Text onPress={() => setError('')}>Close</Text>
+          </Dialog.Actions>
+        </Dialog>
+      </Portal>
+    );
+  }
+
   if (webFromProp?.url) {
     return (
       <WebViewFormExample {...webFromProp} setPageContent={submitConfirm} />
@@ -144,7 +170,7 @@ const ViewDetails = ({route}) => {
       }}>
       <ScrollView contentContainerStyle={styles.container}>
         <View style={styles.sidePadding}>
-          <Text style={styles.title}>{item?.descriptor?.name}</Text>
+          <Text style={styles.title}>{'Benefit'}</Text>
           <View style={styles.benefitAmount}>
             <Icon source={'currency-inr'} size={16} color="#484848" />
             <View style={{flexDirection: 'row', alignItems: 'center'}}>
@@ -196,6 +222,7 @@ const ViewDetails = ({route}) => {
                 scrollEnabled={false}
               />
               <CustomButton
+                marginTop={40}
                 label={
                   isApplied
                     ? 'Application Already Submitted'
@@ -204,7 +231,8 @@ const ViewDetails = ({route}) => {
                 disabled={isApplied}
                 width="100%"
                 mode="contained"
-                handleClick={() => setVisibleDialog(true)}
+                // handleClick={() => setVisibleDialog(true)}
+                handleClick={openCOnfirmDialog}
               />
               <ConfirmationDialog
                 dialogVisible={visibleDialog}

src/service/benefits.js

@@ -101,7 +101,7 @@ export const applyApplication = async ({id, context}) => {
   }
 };
 
-export const confirmApplication = async ({submission_id, context}) => {
+export const confirmApplication = async ({submission_id, item_id, context}) => {
   const data = {
     context: {
       ...context,
@@ -112,7 +112,7 @@ export const confirmApplication = async ({submission_id, context}) => {
     message: {
       order: {
         provider: {
-          id: '79',
+          id: item_id,
           descriptor: {
             name: '',
             images: [],
@@ -122,7 +122,7 @@ export const confirmApplication = async ({submission_id, context}) => {
         },
         items: [
           {
-            id: '79',
+            id: item_id,
             descriptor: {
               name: '',
               long_desc: '',
@@ -160,6 +160,7 @@ export const confirmApplication = async ({submission_id, context}) => {
       },
     },
   };
+
   try {
     const {token} = await getToken();
     const response = await axios.post(`${API_BASE_URL}/confirm`, data, {