bugfixes

components/pages/main/Entry.tsx

@@ -8,7 +8,7 @@ const Entry = () => {
     const [tab, setTab] = useState<"register" | "login" | "reset-password">("login");
 
     return (
-        <View>
+        <View style={{height:"100%"}}>
             {tab === "register" && <SignUpPage setTab={setTab}/>}
             {tab === "login" && <SignInPage setTab={setTab}/>}
             {tab === "reset-password" && <ResetPasswordPage setTab={setTab}/>}

components/pages/main/SignInPage.tsx

@@ -167,7 +167,7 @@ const SignInPage = ({
         bottom
         width="100%"
         height="70%"
-        containerStyle={{ padding: 0 }}
+        containerStyle={{ padding: 15, backgroundColor:"white" }}
       >
         {hasPermission === null ? (
           <Text>Requesting camera permissions...</Text>
@@ -175,7 +175,7 @@ const SignInPage = ({
           <Text>No access to camera</Text>
         ) : (
           <CameraView
-            style={{ flex: 1 }}
+            style={{ flex: 1, borderRadius: 15 }}
             onBarcodeScanned={handleQrCodeScanned}
             barcodeScannerSettings={{
               barcodeTypes: ["qr"],
@@ -186,7 +186,7 @@ const SignInPage = ({
           label="Cancel"
           onPress={() => setShowCameraDialog(false)}
           backgroundColor="#fd1775"
-          style={{ margin: 10 }}
+          style={{ margin: 10, marginBottom: 30 }}
         />
       </Dialog>
     </View>

components/pages/main/SignUpPage.tsx

@@ -10,8 +10,7 @@ import {
     View,
 } from "react-native-ui-lib";
 import {useSignUp} from "@/hooks/firebase/useSignUp";
-import { ProfileType } from "@/contexts/AuthContext";
-import { Dimensions, StyleSheet } from "react-native";
+import {StyleSheet} from "react-native";
 import {AntDesign} from "@expo/vector-icons";
 
 const SignUpPage = ({
@@ -40,7 +39,7 @@ const SignUpPage = ({
     };
 
     return (
-    <View padding-15 marginT-30 height={Dimensions.get("window").height} flexG>
+        <View height={"100%"} padding-15 marginT-30>
             <Text style={styles.title}>Get started with Cally</Text>
             <Text style={styles.subtitle} marginT-15 color="#919191">
                 Please enter your details.
@@ -144,6 +143,7 @@ const SignUpPage = ({
                     </View>
                 </View>
             </View>
+            <View flex-1/>
             <View style={styles.bottomView}>
                 <Button
                     label="Register"
@@ -193,7 +193,7 @@ const styles = StyleSheet.create({
         color: "#919191",
     },
     //mora da se izmeni kako treba
-  bottomView: { marginTop: "auto", marginBottom: 30 },
+    bottomView: {marginTop: "auto", marginBottom: 30, marginTop: "auto"},
     jakartaLight: {
         fontFamily: "PlusJakartaSans_300Light",
         fontSize: 13,

hooks/firebase/useCreateSubUser.ts

@@ -15,7 +15,7 @@ export const useCreateSubUser = () => {
                 return await functions().httpsCallable("createSubUser")({
                     ...userProfile,
                     email,
-                    familyId: profileData?.familyId
+                    familyId: profileData?.familyId!
                 }) as HttpsCallableResult<{ userId: string }>
             } else {
                 throw Error("Can't create sub-users as a non-parent.")