diff --git a/app/Appointments/details.tsx b/app/Appointments/details.tsx index 9d9f7b1c..b1c67b58 100644 --- a/app/Appointments/details.tsx +++ b/app/Appointments/details.tsx @@ -30,7 +30,7 @@ const pkgs = { period: "30 mins", icon: chatIcon, button: { - title: "Message (Start at 16:00 PM)", + title: "Message ", icon: chatIconWhite, nextTo: "/messagingAppointment/messaging", }, @@ -43,7 +43,7 @@ const pkgs = { period: "30 mins", icon: callIcon, button: { - title: "Voice Call (Start at 14:00 PM)", + title: "Voice Call ", icon: callIconWhite, nextTo: "/Appointments/voice-call/call", }, @@ -56,7 +56,7 @@ const pkgs = { period: "30 mins", icon: callIcon, button: { - title: "Video Call (Start at 10:00 AM)", + title: "Video Call", icon: videoIconWhite, nextTo: "/videoCallAppointment", }, @@ -111,14 +111,14 @@ const VideoCallAppointment = ({ route }: any) => { - - - } + // children={ + // // + // // + // // + // } /> diff --git a/app/Appointments/index.tsx b/app/Appointments/index.tsx index 39773a8c..74a5cff7 100644 --- a/app/Appointments/index.tsx +++ b/app/Appointments/index.tsx @@ -90,7 +90,7 @@ function Screen() { ` ) .eq("patient_id", userId) - .eq("status", "Booked").order("appointment_date", { ascending: true }) + .eq("status", "Approved").order("appointment_date", { ascending: true }) .order("appointment_time", { ascending: true }) if (error) { @@ -225,7 +225,7 @@ function Screen() { - @@ -234,7 +234,7 @@ function Screen() { className="w-[25px] h-[25px]" source={require("../../assets/doctors/menu.png")} /> - + */} @@ -291,6 +291,7 @@ function Screen() { > {cancels && ( + {canceledData.map((canceled, index) => ( ))} + )} {complete && ( + {completAppointment.map((appointment:any, index:any) => ( ))} + )} {upcoming && ( + {appointments.map((appointment: any, index: any) => ( openCancelModal(appointment)} /> ))} + )} diff --git a/app/Appointments/voice-call/index.tsx b/app/Appointments/voice-call/index.tsx index d4870538..fd455b05 100644 --- a/app/Appointments/voice-call/index.tsx +++ b/app/Appointments/voice-call/index.tsx @@ -97,7 +97,7 @@ export default function VoiceCallScreen() { height={20} /> - Voice Call (Start at 14:00 PM) + Voice Call diff --git a/app/articles/ArticlesDetails.tsx b/app/articles/ArticlesDetails.tsx index fa42e893..a4824374 100644 --- a/app/articles/ArticlesDetails.tsx +++ b/app/articles/ArticlesDetails.tsx @@ -262,12 +262,12 @@ export default function ArticlesDetails() { source={require("../../assets/articlesImages/rwiza.png")} /> - + {/* - + */} diff --git a/app/articles/ArticlesPage.tsx b/app/articles/ArticlesPage.tsx index 09f521f8..3f8cef77 100644 --- a/app/articles/ArticlesPage.tsx +++ b/app/articles/ArticlesPage.tsx @@ -93,10 +93,10 @@ export default function Article() { - + /> */} diff --git a/app/articles/BookMarkedArticle.tsx b/app/articles/BookMarkedArticle.tsx index 8ce92592..a0b7bde5 100644 --- a/app/articles/BookMarkedArticle.tsx +++ b/app/articles/BookMarkedArticle.tsx @@ -122,12 +122,12 @@ export default function BookMarkedArticle() { padding: 15, }} > - + {/* - - + */} + {/* - + */} diff --git a/app/articles/SeeAllArticles.tsx b/app/articles/SeeAllArticles.tsx index 2407c361..99af44e1 100644 --- a/app/articles/SeeAllArticles.tsx +++ b/app/articles/SeeAllArticles.tsx @@ -99,18 +99,18 @@ export default function SeeAllArticles() { padding: 15, }} > - + {/* - - + */} + {/* - + */} diff --git a/app/messagingAppointment/messaging.tsx b/app/messagingAppointment/messaging.tsx index 2314c452..835bc1b2 100644 --- a/app/messagingAppointment/messaging.tsx +++ b/app/messagingAppointment/messaging.tsx @@ -116,7 +116,7 @@ export default function messagingAppointment() { return ( - + {/* - + */} setVisible(false)}> - + {/* Clear chat @@ -144,7 +144,7 @@ export default function messagingAppointment() { Export chat - + */} diff --git a/assets/icons/radiologist.ts b/assets/icons/cardiologist.ts similarity index 100% rename from assets/icons/radiologist.ts rename to assets/icons/cardiologist.ts diff --git a/assets/icons/index.ts b/assets/icons/index.ts index 5d768fa6..4f02923a 100644 --- a/assets/icons/index.ts +++ b/assets/icons/index.ts @@ -10,8 +10,8 @@ import { more } from "./more"; import { neurologist } from "./neurologist"; import { nutritionist } from "./nutritionist"; import { opthamologist } from "./opthamologist"; -import { pediatric } from "./pediatric"; -import { radiologist } from "./radiologist"; +import { pediatric } from "./pediatrician"; +import { radiologist } from "./cardiologist"; export enum TabsType { HOME = "Home", diff --git a/assets/icons/pediatric.ts b/assets/icons/pediatrician.ts similarity index 100% rename from assets/icons/pediatric.ts rename to assets/icons/pediatrician.ts diff --git a/components/cards/DocButtons.tsx b/components/cards/DocButtons.tsx index 21d3ebe7..e5ed6cbc 100644 --- a/components/cards/DocButtons.tsx +++ b/components/cards/DocButtons.tsx @@ -55,10 +55,10 @@ const DocButton: React.FC = ({ selectedCategory, onCategorySelec Nutritionist onCategorySelect("pediatric")} + style={getButtonStyle("pediatrician")} + onPress={() => onCategorySelect("pediatrician")} > - Pediatric + Pediatrician = ({ selectedCategory, onCategorySelec Neurologist onCategorySelect("radiologist")} + style={getButtonStyle("cardiologist")} + onPress={() => onCategorySelect("cardiologist")} > - Radiologist + Cardiologist = ({ {title} - + {/* {price} - + */} {description} - + {/* (paid) - + */}