From 8a32d2b32ce0cb8aa2f9bd373a57c240b64dfc03 Mon Sep 17 00:00:00 2001
From: Keannu Bernasol <noehbernasol0@gmail.com>
Date: Fri, 27 Oct 2023 22:06:52 +0800
Subject: [PATCH] Fixed left and right caret icons

---
 src/icons/CaretLeftIcon/CaretLeftIcon.tsx                 | 4 ++--
 .../{CaretLeftIcon.tsx => CaretRightIcon.tsx}             | 2 +-
 src/routes/ConversationPage/ConversationPage.tsx          | 8 +++++---
 3 files changed, 8 insertions(+), 6 deletions(-)
 rename src/icons/CaretRightIcon/{CaretLeftIcon.tsx => CaretRightIcon.tsx} (94%)

diff --git a/src/icons/CaretLeftIcon/CaretLeftIcon.tsx b/src/icons/CaretLeftIcon/CaretLeftIcon.tsx
index d6f2c5c..eb5655e 100644
--- a/src/icons/CaretLeftIcon/CaretLeftIcon.tsx
+++ b/src/icons/CaretLeftIcon/CaretLeftIcon.tsx
@@ -18,9 +18,9 @@ export default function CaretRightIcon(props: IconProps) {
       >
         <Path stroke="none" d="M0 0h24v24H0z" fill="none"></Path>
         <Path
-          d="M9 6c0 -.852 .986 -1.297 1.623 -.783l.084 .076l6 6a1 1 0 0 1 .083 1.32l-.083 .094l-6 6l-.094 .083l-.077 .054l-.096 .054l-.036 .017l-.067 .027l-.108 .032l-.053 .01l-.06 .01l-.057 .004l-.059 .002l-.059 -.002l-.058 -.005l-.06 -.009l-.052 -.01l-.108 -.032l-.067 -.027l-.132 -.07l-.09 -.065l-.081 -.073l-.083 -.094l-.054 -.077l-.054 -.096l-.017 -.036l-.027 -.067l-.032 -.108l-.01 -.053l-.01 -.06l-.004 -.057l-.002 -12.059z"
+          d="M13.883 5.007l.058 -.005h.118l.058 .005l.06 .009l.052 .01l.108 .032l.067 .027l.132 .07l.09 .065l.081 .073l.083 .094l.054 .077l.054 .096l.017 .036l.027 .067l.032 .108l.01 .053l.01 .06l.004 .057l.002 .059v12c0 .852 -.986 1.297 -1.623 .783l-.084 -.076l-6 -6a1 1 0 0 1 -.083 -1.32l.083 -.094l6 -6l.094 -.083l.077 -.054l.096 -.054l.036 -.017l.067 -.027l.108 -.032l.053 -.01l.06 -.01z"
           stroke-width="0"
-          fill="currentColor"
+          fill={colors.icon_color}
         ></Path>
       </Svg>
     </>
diff --git a/src/icons/CaretRightIcon/CaretLeftIcon.tsx b/src/icons/CaretRightIcon/CaretRightIcon.tsx
similarity index 94%
rename from src/icons/CaretRightIcon/CaretLeftIcon.tsx
rename to src/icons/CaretRightIcon/CaretRightIcon.tsx
index e2caaa5..eb5655e 100644
--- a/src/icons/CaretRightIcon/CaretLeftIcon.tsx
+++ b/src/icons/CaretRightIcon/CaretRightIcon.tsx
@@ -3,7 +3,7 @@ import { IconProps } from "../../interfaces/Interfaces";
 import { Svg, Path } from "react-native-svg";
 import { colors } from "../../styles";
 
-export default function CaretLeftIcon(props: IconProps) {
+export default function CaretRightIcon(props: IconProps) {
   return (
     <>
       <Svg
diff --git a/src/routes/ConversationPage/ConversationPage.tsx b/src/routes/ConversationPage/ConversationPage.tsx
index 5f433ef..6bec280 100644
--- a/src/routes/ConversationPage/ConversationPage.tsx
+++ b/src/routes/ConversationPage/ConversationPage.tsx
@@ -71,7 +71,7 @@ export default function ConversationPage() {
     enabled:
       student_status?.study_group != "" && student_status?.study_group != null,
     queryKey: ["study_group"],
-    refetchInterval: 20,
+    refetchInterval: 10000,
     queryFn: async () => {
       const data = await GetStudyGroup(student_status?.study_group || "");
       if (data[0] == false) {
@@ -129,7 +129,7 @@ export default function ConversationPage() {
   // Avatar List
   const [users, setUsers] = useState<GroupMessageAvatarType[]>([]);
   const AvatarsQuery = useQuery({
-    refetchInterval: 3000,
+    refetchInterval: 10000,
     enabled:
       student_status?.study_group != null ||
       (student_status?.study_group != "" &&
@@ -211,7 +211,9 @@ export default function ConversationPage() {
                   paddingRight: 4,
                 }}
               >
-                {studygroup.students.length} studying
+                {!StudyGroupQuery.isFetching
+                  ? studygroup.students.length + " studying"
+                  : "Loading"}
               </Text>
               {users.map((user: GroupMessageAvatarType, index: number) => {
                 if (index > 6) {