From 4ddc76faa4f084337719a4ab2eed57f1eb3827dd Mon Sep 17 00:00:00 2001
From: thschleicher <thschleicher@edu.aau.at>
Date: Thu, 25 Jan 2024 15:38:50 +0100
Subject: [PATCH] fixed euro sign on expense item (dont judge me I know this
 isnt the correct branch) and fixed the async storage so it acctually loads on
 the info

---
 app/(tabs)/(budget)/index.tsx   | 7 ++++---
 components/home/expenseItem.tsx | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/(tabs)/(budget)/index.tsx b/app/(tabs)/(budget)/index.tsx
index b03fc12..22f61dd 100644
--- a/app/(tabs)/(budget)/index.tsx
+++ b/app/(tabs)/(budget)/index.tsx
@@ -1,4 +1,5 @@
 import AsyncStorage from '@react-native-async-storage/async-storage';
+import { useIsFocused } from '@react-navigation/native';
 import { router, useNavigation } from 'expo-router';
 import { useEffect, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
@@ -13,6 +14,7 @@ export default function Page() {
     const containerColor = colors.containerColor;
     const navigation = useNavigation();
     const [selectedPage, setSelectedPage] = useState("noPageLoaded");
+    const isFocused = useIsFocused();
 
     useEffect(() => {
         AsyncStorage.getItem("currentBudgetPage").then((page) => {
@@ -22,15 +24,14 @@ export default function Page() {
         }).catch((error) => {
             console.log("Error fetching previous page from Async Storage:", error);
         })
-    }, []);
+    }, [isFocused]);
 
     const {data, isLoading, reFetch} = useFetch({sql: "SELECT c.guid AS category_guid, c.name AS category_name, c.color AS category_color, c.type AS category_type, SUM(e.amount) as total_expenses, c.allocated_amount as allocated_amount FROM category c LEFT JOIN expense e ON e.category_guid = c.guid WHERE c.type = ? GROUP BY c.guid", args: selectedPage === "expenses" ? ["expense"] : selectedPage === "savings" ? ["saving"] : []});
 
     useEffect(() => {
-        reFetch()
+        reFetch();
     }, [selectedPage]);
 
-
     const handlePageSelection = (page: string) => {
         if(page !== selectedPage) {
             setSelectedPage(page);
diff --git a/components/home/expenseItem.tsx b/components/home/expenseItem.tsx
index ff6eb2a..fd00c7f 100644
--- a/components/home/expenseItem.tsx
+++ b/components/home/expenseItem.tsx
@@ -1,9 +1,9 @@
 import React from 'react';
 import { ColorValue, StyleSheet, Text, View } from 'react-native';
+import { TouchableOpacity } from 'react-native-gesture-handler';
+import { useTheme } from '../../app/contexts/ThemeContext';
 import { SIZES } from '../../constants/theme';
 import CustomCard from "../common/CustomCard";
-import { useTheme } from '../../app/contexts/ThemeContext';
-import { TouchableOpacity } from 'react-native-gesture-handler';
 
 //export type ExpenseItemProps = {color: ColorValue, category: string, title: string, date: string, value : string}
 interface ExpenseItemProps {
@@ -44,9 +44,10 @@ export default function ExpenseItem(itemProps : ExpenseItemProps) {
             </View>
             <View style={[styles.valueSection, {backgroundColor: colors.backgroundColor}]}>
               <Text style={{
+                paddingRight: 10,
                 fontSize: SIZES.xxLarge,
                 color: colors.primaryText
-              }} numberOfLines={1}>{itemProps.value}</Text>
+              }} numberOfLines={1}>{itemProps.value + " €"}</Text>
             </View>
           </View>
        </TouchableOpacity>