Fixed old vote not loading

M0ngi · Mar 16, 2022 · 2cfdd23 · 2cfdd23
1 parent d7feebe
commit 2cfdd23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/screens/VoteScreen/VoteScreen.js b/screens/VoteScreen/VoteScreen.js
@@ -10,17 +10,19 @@ import BlueButton from "../../components/BlueButton/BlueButton";
 
 import { CheckBox, Icon } from 'react-native-elements';
 import { getParticipantList, voteForParticipant } from "../../services/vote/userFuncs";
+import { CurrentUser } from "../../utils/user";
 
 
 export default function VoteScreen(){
 
     const { dispatchInfo } = useContext(InfoContext);
     const [universities, setUniversities] = useState([]); // ["INSAT", "ESPRIT", "MSU"]
     const [choosed, setchoosed] = useState(null);
-    const [voted, setVoted] = useState(null);
+    const [voted, setVoted] = useState(CurrentUser.votedFor);
     const [loading, setLoading] = useState(false);
 
     useEffect(()=>{
+        console.log(CurrentUser.votedFor)
         getParticipantList()
             .then((arr)=>{
                 setUniversities(arr);

diff --git a/services/firestore/userFuncs.js b/services/firestore/userFuncs.js
@@ -81,9 +81,9 @@ export async function getCurrentUserData(){
 
     let userPath = ref(rtdb, USER_PATH + auth.currentUser.uid);
     let vote = (await get(userPath));
-
+    
     if(!vote.exists()) return {...data, votedFor: null, phone: phone.phone, email: email};
-    return {data, votedFor: vote.votedFor, phone: phone.phone, email: email};
+    return {data, votedFor: vote.toJSON().votedFor, phone: phone.phone, email: email};
 }
 
 export async function readDataFromPath(path){