mirror of
https://github.com/urosran/cally.git
synced 2025-07-17 02:25:10 +00:00
Merge branch 'main' into dev
This commit is contained in:
@ -1,12 +1,7 @@
|
||||
import { View, Text } from "react-native";
|
||||
import React, { RefObject, useEffect, useRef, useState } from "react";
|
||||
import {Text, View} from "react-native";
|
||||
import React, {useEffect, useRef} from "react";
|
||||
import {TextField, TextFieldRef} from "react-native-ui-lib";
|
||||
import {
|
||||
GroceryCategory,
|
||||
IGrocery,
|
||||
useGroceryContext,
|
||||
} from "@/contexts/GroceryContext";
|
||||
import { TouchableWithoutFeedback } from "react-native-gesture-handler";
|
||||
import {GroceryCategory, IGrocery, useGroceryContext,} from "@/contexts/GroceryContext";
|
||||
|
||||
interface IEditGrocery {
|
||||
id?: number;
|
||||
@ -41,9 +36,12 @@ const EditGroceryItem = ({ editGrocery }: { editGrocery: IEditGrocery }) => {
|
||||
width: "100%",
|
||||
borderRadius: 25,
|
||||
padding: 15,
|
||||
marginTop: 10
|
||||
}}
|
||||
>
|
||||
<TextField
|
||||
text70T
|
||||
style={{fontWeight: "400"}}
|
||||
ref={inputRef}
|
||||
placeholder="Grocery"
|
||||
value={editGrocery.title}
|
||||
|
@ -75,7 +75,7 @@ const GroceryItem = ({
|
||||
{!isEditingTitle ? (
|
||||
<View>
|
||||
<TouchableOpacity onPress={() => setIsEditingTitle(true)}>
|
||||
<Text text70T>{item.title}</Text>
|
||||
<Text text70T black style={{fontWeight: "400"}}>{item.title}</Text>
|
||||
</TouchableOpacity>
|
||||
</View>
|
||||
) : (
|
||||
|
@ -178,7 +178,6 @@ const GroceryList = () => {
|
||||
{/* Approved Section */}
|
||||
<View row spread marginT-40 marginB-0 centerV>
|
||||
<View row centerV>
|
||||
<Text text70BL>Shopping List</Text>
|
||||
{approvedVisible && (
|
||||
<AntDesign
|
||||
name="down"
|
||||
@ -201,6 +200,7 @@ const GroceryList = () => {
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<Text text70BL>Shopping List</Text>
|
||||
</View>
|
||||
<View
|
||||
centerV
|
||||
|
@ -1,11 +1,12 @@
|
||||
import {useAuthContext} from "@/contexts/AuthContext";
|
||||
import {useMutation} from "react-query";
|
||||
import {useMutation, useQueryClient} from "react-query";
|
||||
import firestore from "@react-native-firebase/firestore";
|
||||
import {UserProfile} from "@/hooks/firebase/types/profileTypes";
|
||||
import {FirebaseAuthTypes} from "@react-native-firebase/auth";
|
||||
|
||||
export const useUpdateUserData = () => {
|
||||
const {user: currentUser, refreshProfileData} = useAuthContext();
|
||||
const queryClient = useQueryClient()
|
||||
|
||||
return useMutation({
|
||||
mutationKey: ["updateUserData"],
|
||||
@ -35,6 +36,9 @@ export const useUpdateUserData = () => {
|
||||
} else {
|
||||
console.warn("No user found: currentUser and customUser are both undefined.");
|
||||
}
|
||||
},
|
||||
onSuccess: () => {
|
||||
queryClient.invalidateQueries("events")
|
||||
}
|
||||
});
|
||||
};
|
||||
|
Reference in New Issue
Block a user