Merge branch 'dev'

# Conflicts:
#	ios/cally/Info.plist
This commit is contained in:
Milan Paunovic
2024-10-21 10:05:05 +02:00
21 changed files with 638 additions and 355 deletions
+8 -8
View File
@@ -1,23 +1,23 @@
import React from "react";
import {ImageBackground, StyleSheet} from "react-native";
import {Text, TouchableOpacity, View} from "react-native-ui-lib";
import {StyleSheet} from "react-native";
import {Image, Text, TouchableOpacity, View} from "react-native-ui-lib";
import RemoveAssigneeBtn from "./RemoveAssigneeBtn";
import {useGetFamilyMembers} from "@/hooks/firebase/useGetFamilyMembers";
const AssigneesDisplay = ({selectedAttendees, setSlectedAttendees}: {
const AssigneesDisplay = ({selectedAttendees, setSelectedAttendees}: {
selectedAttendees: string[],
setSlectedAttendees: (value: React.SetStateAction<string[]>) => void
setSelectedAttendees: (value: React.SetStateAction<string[]>) => void
}) => {
const {data: members} = useGetFamilyMembers(true);
const selectedMembers = members?.filter((x) => selectedAttendees.includes(x?.uid!));
const selectedMembers = members?.filter((x) => selectedAttendees?.includes(x?.uid!));
const getInitials = (firstName: string, lastName: string) => {
return `${firstName.charAt(0)}${lastName.charAt(0)}`;
};
const removeAttendee = (uid: string) => {
setSlectedAttendees((prev) => prev.filter((x) => x !== uid));
setSelectedAttendees((prev) => prev.filter((x) => x !== uid));
}
return (
@@ -26,7 +26,7 @@ const AssigneesDisplay = ({selectedAttendees, setSlectedAttendees}: {
<TouchableOpacity key={member.uid} style={styles.assigneeWrapper}
onPress={() => removeAttendee(member.uid!)}>
{member?.pfp ? (
<ImageBackground
<Image
source={{uri: member?.pfp}}
style={styles.image}
children={<RemoveAssigneeBtn/>}
@@ -42,7 +42,7 @@ const AssigneesDisplay = ({selectedAttendees, setSlectedAttendees}: {
</TouchableOpacity>
))}
{selectedAttendees.length === 0 && <Text>No attendees added</Text>}
{selectedAttendees?.length === 0 && <Text>No attendees added</Text>}
</View>
);
};