Avatar component; Indicators components.

client/src/pages/HomePage.tsx

@@ -4,13 +4,10 @@ import { useMe, useLogout } from "../hooks/useAuth";
 import { useNavigate } from "react-router";
 import ShareFilledIcon from "../components/icons/ShareFilledIcon";
 import usePopupStore from "../store/popupStore";
-<<<<<<< HEAD
-import ParticipantsPopup from "../components/popups/ParticipantsPopup";
-=======
 import SettingsModal from "../components/modals/SettingsModal";
 import useModalStore from "../store/modalStore";
 import CogFilledIcon from "../components/icons/CogFilledIcon";
->>>>>>> 79fb7f2748fcb76e887daa397ff450afc389a2b3
+import ParticipantsPopup from "../components/popups/ParticipantsPopup";
 
 function HomePage() {
   const { data: user } = useMe();
@@ -35,15 +32,7 @@ function HomePage() {
 
           <FloatingActionButton
             variant="default"
-<<<<<<< HEAD
             onClick={() => setPopup(<ParticipantsPopup />)}
-=======
-            onClick={() =>
-              setPopup(
-                <SharePopup link={"https://estate.stream/ahdy12jdco1"} />
-              )
-            }
->>>>>>> 79fb7f2748fcb76e887daa397ff450afc389a2b3
           >
             <div className="2xl:size-[1.111vw] size-4 text-white">
               <ShareFilledIcon />