Merge pull request #225 from atlp-rwanda/ft-end-chats

Feature: allow user to end chat and leave a review
atlp-rwanda · Jul 18, 2024 · 5ee5d11 · 5ee5d11
2 parents 22b0b53 + 92809e8
commit 5ee5d11
Show file tree

Hide file tree

Showing 16 changed files with 337 additions and 240 deletions.
diff --git a/app/(app)/ActionMenu/Booking/BookingAppointment.tsx b/app/(app)/ActionMenu/Booking/BookingAppointment.tsx
@@ -1,5 +1,5 @@
 import React, { useContext, useEffect, useState } from "react";
-import { Text, View, StyleSheet, ScrollView,Alert } from "react-native";
+import { Text, View, ScrollView,Alert } from "react-native";
 import { Colors } from "@/constants/Colors";
 import { router } from "expo-router";
 import { ThemeContext } from "@/ctx/ThemeContext";
@@ -14,8 +14,8 @@ import { useLocalSearchParams } from "expo-router";
 import { supabase } from "@/lib/supabase";
 
 export default function BookingAppointment() {
-  const { theme, changeTheme } = useContext(ThemeContext);
-  const [timeSlots, setTimeSlots] = useState([""]);
+  const { theme } = useContext(ThemeContext);
+    const [timeSlots, setTimeSlots] = useState([""]);
   const [selectedDate, setSelectedDate] = useState("");
   const [selectedHour, setSelectedHour] = useState("");
   const [availableTimeSlots,setAvailbaleTimeSlots]=useState<string[]>([])
@@ -94,15 +94,14 @@ export default function BookingAppointment() {
   }
 
   return (
-    <ScrollView
+    <View
       style={{
         flex: 1,
+        flexGrow: 1,
         backgroundColor:
           theme === "light" ? Colors.others.white : Colors.dark._1,
       }}
-      contentContainerStyle={{
-        flexGrow: 1,
-      }}
+
     >
       <View style={{}}>
         <View
@@ -159,6 +158,6 @@ export default function BookingAppointment() {
           onPress={handleNextPress}
         />
       </View>
-    </ScrollView>
+    </View>
   );
 }
diff --git a/app/(app)/ActionMenu/Booking/EnterYourPin.tsx b/app/(app)/ActionMenu/Booking/EnterYourPin.tsx
@@ -16,7 +16,6 @@ import { router } from "expo-router";
 import { useModal } from "@/ctx/ModalContext";
 import { ThemeContext } from "@/ctx/ThemeContext";
 import Button from "@/components/UI/Button";
-import { useEffect } from "react";
 import React from "react";
 import { supabase } from "@/lib/supabase";
 

diff --git a/app/(app)/ActionMenu/Booking/Select-package.tsx b/app/(app)/ActionMenu/Booking/Select-package.tsx
@@ -4,12 +4,7 @@ import { router,useLocalSearchParams } from "expo-router";
 import React, { useContext, useState } from "react";
 import {
   View,
-  StyleSheet,
   Text,
-  Pressable,
-  TextInput,
-  Image,
-  TouchableOpacity,
   ScrollView,
   Alert
 } from "react-native";
@@ -25,14 +20,12 @@ import {
   phoneIcon,
   videoIcon,
 } from "@/constants/icon";
-import PackageItem from "@/components/UI/PackageItem";
-import { useTheme } from "react-native-paper";
 import PackagesContainer from "@/components/PackagesContainer";
 import Button from "@/components/UI/Button";
 import { StatusBar } from "expo-status-bar";
 
 const SelectPackage = () => {
-  const { theme, changeTheme } = useContext(ThemeContext);
+  const { theme } = useContext(ThemeContext);
   const { Doctor_id, hour, date,patient_id } = useLocalSearchParams()
   const [selectedPackageTitle, setSelectedPackageTitle] = useState<{ title: string, price: string }>({ title: "Messaging", price: "Rwf20" })
   const [selectedDuration, setSelectedDuration] = useState<string>("1 hour")

diff --git a/app/(app)/ActionMenu/FavoriteDoctorScreen.tsx b/app/(app)/ActionMenu/FavoriteDoctorScreen.tsx
@@ -1,16 +1,9 @@
 import React,{ReactElement, useEffect, useState} from 'react';
 import { StyleSheet, Text, Image, View, TouchableHighlight, SafeAreaView, Button, Alert, Platform, Dimensions,TextInput, ScrollView, Pressable} from 'react-native'
-import { Feather } from '@expo/vector-icons';
-import { AntDesign } from '@expo/vector-icons';
-import { Ionicons } from '@expo/vector-icons';
 import DoctorComponent from '@/components/DoctorComponent';
-import { FontAwesome } from '@expo/vector-icons';
  import { SvgXml } from "react-native-svg"
 import { blueheart } from '@/assets/icons/blueHeart';
 import { star } from '@/assets/icons/star';
-import { search } from '@/assets/icons/search';
-import { more } from '@/assets/icons/more';
-import { LightleftArrow } from '@/assets/icons/left';
 import data from "../../doctors.json"
 import HeaderComponent from '@/components/HeaderComponent';
 import SearchComponent from '@/components/SearchComponent';
@@ -19,7 +12,6 @@ import NofoundComponent from '@/components/NofoundComponent';
 import RemovefavoritePopup from '@/components/RemovefavoritePopup';
 import FilterPopup from '@/components/FilterSearchComponent';
 import { StatusBar } from 'expo-status-bar';
-import NotFoundScreen from '@/app/+not-found';
 import { ThemeContext } from '@/ctx/ThemeContext';
 import { useContext } from 'react';
 import { supabase } from '@/lib/supabase';

diff --git a/app/(app)/ActionMenu/index.tsx b/app/(app)/ActionMenu/index.tsx
@@ -352,7 +352,7 @@ const specializations = [
       <ScrollView
         showsVerticalScrollIndicator={false}
         alwaysBounceVertical={true}
-        contentContainerStyle={{ height: "150%" }}
+        contentContainerStyle={{ height: "205%" }}
       >
         <View
           style={{
@@ -429,7 +429,8 @@ const specializations = [
             alignItems: "center",
             gap: 20,
             marginTop: 10,
-            width: width
+            width: width,
+            backgroundColor: theme === "dark" ? "#181A20" : "#ffffff",
 
         }}>
           {specializations.map((specialization, index) => (
@@ -446,7 +447,9 @@ const specializations = [
               backgroundColor: theme === "dark" ? "#181A20" : "#ffffff",
             }}>
               <SvgXml xml={specialization.icon === null ? GeneralIcon : specialization.icon} />
-              <Text>{specialization.text.slice(0,8)+"..."}</Text>
+              <Text
+              style={{color: theme === "dark" ? "#FFFFFF" : "#000000", fontFamily: "Urbanist-bold", fontSize: 15}}
+              >{specialization.text.slice(0,8)+"..."}</Text>
             </TouchableOpacity>
           ))}
         </View>
@@ -515,7 +518,7 @@ const specializations = [
             }}
           >
             {filteredDoctors.length > 0 ? (
-              filteredDoctors.map((doctor: any, index: number) => {
+              filteredDoctors.splice(0,5).map((doctor: any, index: number) => {
 
                 return(
 

diff --git a/app/(app)/Appointments/MessagingAppointment/ChannelList.tsx b/app/(app)/Appointments/MessagingAppointment/ChannelList.tsx
@@ -8,7 +8,7 @@ import { useAppContext } from '@/ctx/ChatContext';
 import { PatientTypes } from '@/constants/Types';
 import {useRouter } from 'expo-router';
 
-const ChannelLists = (props: any) => {
+const ChannelLists = ({appointmentId}:{appointmentId:any}) => {
     const { channel, setChannel } = useAppContext();
     const [patientData, setPatientData] = useState<PatientTypes[] | null>(null);
     const { userId, } = useContext(AuthContext);
@@ -34,7 +34,7 @@ const ChannelLists = (props: any) => {
       setChannel(channel);
       router.push({
         pathname: "(app)/Appointments/MessagingAppointment/ChannelScreen",
-        params: { id: channel?.id },
+        params: { id: channel?.id, appointmentId },
       });
     };