Merge branch 'development' of github.com:UNICEFECAR/USupport-mobile i…

…nto fix/issue_76

i18n.js

@@ -89,6 +89,7 @@ import {
   RequireDataAgreemant,
   RequireRegistration,
   HowItWorksMyQA,
+  DeleteChatHistory,
 } from "./src/modals/locales.js";
 
 import { TabNavigation } from "./src/navigation/locales.js";
@@ -180,6 +181,7 @@ const resources = {
     "require-data-agreement": RequireDataAgreemant.en,
     "require-registration": RequireRegistration.en,
     "how-it-works-my-qa": HowItWorksMyQA.en,
+    "delete-chat-history": DeleteChatHistory.en,
 
     // Navigation
     "tab-navigation": TabNavigation.en,
@@ -271,6 +273,7 @@ const resources = {
     "require-data-agreement": RequireDataAgreemant.ru,
     "require-registration": RequireRegistration.ru,
     "how-it-works-my-qa": HowItWorksMyQA.ru,
+    "delete-chat-history": DeleteChatHistory.ru,
 
     // Navigation
     "tab-navigation": TabNavigation.ru,
@@ -362,6 +365,7 @@ const resources = {
     "require-data-agreement": RequireDataAgreemant.kk,
     "require-registration": RequireRegistration.kk,
     "how-it-works-my-qa": HowItWorksMyQA.kk,
+    "delete-chat-history": DeleteChatHistory.kk,
 
     // Navigation
     "tab-navigation": TabNavigation.kk,

src/blocks/ActivityHistory/locales/en.json

@@ -12,6 +12,7 @@
   "client_camera_on": "The client has turned on the camera",
   "client_microphone_off": "The client has turned off the microphone",
   "client_microphone_on": "The client has turned on the microphone",
+    "chat_history_deleted_by_client": "You have deleted the chat history",
 
   "provider_joined": "Provider joined the consultation",
   "provider_left": "The provider has left the consultation",

src/blocks/ActivityHistory/locales/kk.json

@@ -13,6 +13,7 @@
   "client_camera_on": "Клиент камераны қосты",
   "client_microphone_off": "Клиент микрофонды өшірді",
   "client_microphone_on": "Клиент микрофонды қосты",
+  "chat_history_deleted_by_client": "Сіз чат тарихын жойдыңыз",
 
   "provider_joined": "Консультант консультацияға қосылды",
   "provider_left": "Консультант консультациядан шықты",

src/blocks/ActivityHistory/locales/ru.json

@@ -13,6 +13,7 @@
   "client_camera_on": "Клиент включил камеру",
   "client_microphone_off": "Клиент выключил микрофон",
   "client_microphone_on": "Клиент включил микрофон",
+  "chat_history_deleted_by_client": "Вы удалили историю чата",
 
   "provider_joined": "Консультант присоединился к консультации",
   "provider_left": "Консультант покинул консультацию",

src/blocks/Consultations/Consultations.jsx

@@ -1,4 +1,4 @@
-import Reac, { useState, useCallback, useMemo } from "react";
+import { useState, useCallback, useMemo } from "react";
 import { useTranslation } from "react-i18next";
 import { StyleSheet, View } from "react-native";
 

src/blocks/UserDetails/UserDetails.jsx

@@ -42,6 +42,7 @@ export const UserDetails = ({
   openDeleteAccountBackdrop,
   openSelectAvatarBackdrop,
   openDeletePictureBackdrop,
+  openDeleteChatHistoryBackdrop,
   navigation,
 }) => {
   const { t } = useTranslation("user-details");
@@ -458,6 +459,17 @@ export const UserDetails = ({
                 label={t("delete_account")}
                 type={"ghost"}
                 onPress={openDeleteAccountBackdrop}
+                style={styles.textButton}
+              />
+              <ButtonWithIcon
+                iconName={"circle-actions-close"}
+                iconSize={"md"}
+                size="lg"
+                iconColor={"#eb5757"}
+                color={"red"}
+                label={t("delete_chat")}
+                type={"ghost"}
+                onPress={openDeleteChatHistoryBackdrop}
                 style={[styles.textButton, styles.marginBottom20]}
               />
             </View>

src/blocks/UserDetails/locales/en.json

@@ -23,6 +23,7 @@
   "change_password": "Change password",
   "delete_account": "Delete account",
   "logout": "Logout",
+  "delete_chat": "Clear chat history",
 
   "dropdown_sex_label": "Gender",
   "dropdown_year_label": "Year of birth",

src/blocks/UserDetails/locales/kk.json

@@ -23,6 +23,7 @@
   "change_password": "Құпия сөзді өзгерту",
   "delete_account": "Аккаунтты жою",
   "logout": "Шығу",
+  "delete_chat": "Чат тарихын тазалау",
 
   "dropdown_sex_label": "Жынысы",
   "dropdown_year_label": "Туған жылы",

src/blocks/UserDetails/locales/ru.json

@@ -23,6 +23,7 @@
   "change_password": "Изменить пароль",
   "delete_account": "Удалить аккаунт",
   "logout": "Выйти",
+  "delete_chat": "Очистить историю чата",
 
   "dropdown_sex_label": "Пол",
   "dropdown_year_label": "Год рождения",

src/components/modals/TransparentModal.jsx

@@ -26,6 +26,7 @@ export function TransparentModal({
   handleClose,
   ctaLabel,
   ctaHandleClick,
+  ctaColor = "green",
   isCtaDisabled = false,
   secondaryCtaLabel,
   secondaryCtaHandleClick,
@@ -70,6 +71,7 @@ export function TransparentModal({
                     size="lg"
                     disabled={isCtaDisabled}
                     loading={isCtaLoading}
+                    color={ctaColor}
                   />
                 ) : null}
                 {secondaryCtaLabel && (

src/modals/DeleteChatHistory/DeleteChatHistory.jsx

@@ -0,0 +1,57 @@
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { useMutation } from "@tanstack/react-query";
+
+import { TransparentModal } from "#components";
+import { useError } from "#hooks";
+import { showToast } from "#utils";
+import { clientSvc } from "#services";
+
+/**
+ * DeleteChatHistory
+ *
+ * The DeleteChatHistory modal
+ *
+ * @return {jsx}
+ */
+export const DeleteChatHistory = ({ isOpen, onClose }) => {
+  const { t } = useTranslation("delete-chat-history");
+
+  const [errors, setErrors] = useState({});
+
+  const deleteChat = async () => {
+    const res = await clientSvc.deleteChatHistory();
+    return res;
+  };
+
+  const deleteAccountMutation = useMutation(deleteChat, {
+    onSuccess: () => {
+      showToast({ message: t("success") });
+      onClose();
+    },
+    onError: (error) => {
+      const { message: errorMessage } = useError(error);
+      setErrors({ submit: errorMessage });
+    },
+  });
+
+  const handleConfirm = () => {
+    deleteAccountMutation.mutate();
+  };
+
+  return (
+    <TransparentModal
+      heading={t("heading")}
+      text={t("subheading")}
+      isOpen={isOpen}
+      handleClose={onClose}
+      ctaLabel={t("confirm")}
+      ctaColor="red"
+      ctaHandleClick={handleConfirm}
+      secondaryCtaLabel={t("cancel")}
+      secondaryCtaType="primary"
+      secondaryCtaHandleClick={onClose}
+      errorMessage={errors.submit}
+    />
+  );
+};

src/modals/DeleteChatHistory/index.js

@@ -0,0 +1 @@
+export * from "./DeleteChatHistory.jsx";

src/modals/DeleteChatHistory/locales.js

@@ -0,0 +1,3 @@
+export * as en from "./locales/en.json";
+export * as ru from "./locales/ru.json";
+export * as kk from "./locales/kk.json";

src/modals/DeleteChatHistory/locales/en.json

@@ -0,0 +1,7 @@
+{
+    "heading": "Are you sure you want to delete all your chat data?",
+    "subheading": "This action is irreversible.",
+    "confirm": "Yes, delete all my chat data",
+    "cancel": "No, keep my chat data",
+    "success": "Your chat data has been deleted successfully."
+}

src/modals/DeleteChatHistory/locales/kk.json

@@ -0,0 +1,7 @@
+{
+    "heading": "Чат деректеріңіздің бәрін жою керек пе екеніне сенімдісіз бе?",
+    "subheading": "Бұл әрекетті болдырмауға болмайды.",
+    "confirm": "Иә, чат деректерімді бәрін жою",
+    "cancel": "Жоқ, чат деректерімді сақтау",
+    "success": "Сіздің чат деректеріңіз сәтті жойылды."
+}

src/modals/DeleteChatHistory/locales/ru.json

@@ -0,0 +1,7 @@
+{
+    "heading": "Вы уверены, что хотите удалить всю вашу историю чата?",
+    "subheading": "Это действие необратимо.",
+    "confirm": "Да, удалить всю мою историю чата",
+    "cancel": "Нет, сохранить мою историю чата",
+    "success": "Ваша история чата была успешно удалена."
+}

src/modals/index.js

@@ -3,3 +3,4 @@ export * from "./RequireDataAgreemant";
 export * from "./MoodTrackerMoreInformation";
 export * from "./PaymentInformation";
 export * from "./HowItWorksMyQA";
+export * from "./DeleteChatHistory";

src/modals/locales.js

@@ -3,3 +3,4 @@ export * as RequireDataAgreemant from "./RequireDataAgreemant/locales";
 export * as MoodTrackerMoreInformation from "./MoodTrackerMoreInformation/locales";
 export * as PaymentInformation from "./PaymentInformation/locales";
 export * as HowItWorksMyQA from "./HowItWorksMyQA/locales";
+export * as DeleteChatHistory from "./DeleteChatHistory/locales";

src/screens/Consultation/Consultation.jsx

@@ -152,20 +152,25 @@ export const Consultation = ({ navigation, route }) => {
       : false;
   };
 
-  const chatDataQuery = useGetChatData(consultation?.chatId, (data) => {
+  const onGetChatDataSuccess = (data) => {
     setIsProviderInSession(checkHasProviderJoined(data.messages));
     setMessages((prev) => ({
       ...prev,
       currentSession: data.messages,
     }));
-  });
+  };
+
+  const chatDataQuery = useGetChatData(
+    consultation?.chatId,
+    onGetChatDataSuccess
+  );
 
   const clientId = chatDataQuery.data?.clientDetailId;
   const providerId = chatDataQuery.data?.providerDetailId;
   const allChatHistoryQuery = useGetAllChatHistoryData(
     providerId,
     clientId,
-    true
+    chatDataQuery.isFetched
   );
 
   useEffect(() => {
@@ -204,16 +209,23 @@ export const Consultation = ({ navigation, route }) => {
   useEffect(() => {
     if (
       allChatHistoryQuery.data?.messages &&
+      chatDataQuery.data?.messages &&
       !messages.previousSessions.length
     ) {
       setMessages((prev) => {
+        const currentMessagesTimes = chatDataQuery.data.messages.map(
+          (x) => x.time
+        );
+        const previousFiltered = allChatHistoryQuery.data.messages
+          .flat()
+          .filter((x) => !currentMessagesTimes.includes(x.time));
         return {
           ...prev,
-          previousSessions: allChatHistoryQuery.data.messages,
+          previousSessions: previousFiltered,
         };
       });
     }
-  }, [allChatHistoryQuery.data]);
+  }, [allChatHistoryQuery.data, chatDataQuery.data]);
 
   useEffect(() => {
     if (

src/screens/Consultation/locales/en.json

@@ -19,6 +19,7 @@
   "provider_camera_on": "The provider has turned on the camera",
   "provider_microphone_off": "The provider has turned off the microphone",
   "provider_microphone_on": "The provider has turned on the microphone",
+  "chat_history_deleted_by_client": "You have deleted the chat history",
 
   "send_message": "Type your message here...",
   "show_system_messages": "Show system messages",

src/screens/Consultation/locales/kk.json

@@ -20,6 +20,7 @@
   "provider_camera_on": "Консультант камераны қосты",
   "provider_microphone_off": "Консультант микрофонды өшірді",
   "provider_microphone_on": "Консультант микрофонды қосты",
+  "chat_history_deleted_by_client": "Сіз чат тарихын жойдыңыз",
 
   "send_message": "Хабарламаңызды осы жерге енгізіңіз...",
   "show_system_messages": "Жүйелік хабарламаларды көрсету",

src/screens/Consultation/locales/ru.json

@@ -20,6 +20,7 @@
   "provider_camera_on": "Консультант включил камеру",
   "provider_microphone_off": "Консультант отключил микрофон",
   "provider_microphone_on": "Консультант включил микрофон",
+  "chat_history_deleted_by_client": "Вы удалили историю чата",
 
   "send_message": "Введите Ваше сообщение здесь...",
   "show_system_messages": "Показать системные сообщения",

src/screens/UserDetails/UserDetails.jsx

@@ -7,6 +7,7 @@ import {
   DeleteProfilePicture,
   SelectAvatar,
 } from "#backdrops";
+import { DeleteChatHistory } from "#modals";
 
 /**
  * UserDetails
@@ -22,17 +23,25 @@ export const UserDetails = ({ navigation }) => {
     useState(false);
   const [isDeletePictureBackdropShown, setIsDeletePictureBackdropShown] =
     useState(false);
+  const [
+    isDeleteChatHistoryBackdropShown,
+    setIsDeleteChatHistoryBackdropShown,
+  ] = useState(false);
 
   const openChangePasswordBackdrop = () => setIsChangePasswordOpen(true);
   const openDeleteAccountBackdrop = () => setIsDeleteBackdropShown(true);
   const openSelectAvatarBackdrop = () => setIsSelectAvatarBackdropShown(true);
   const openDeletePictureBackdrop = () => setIsDeletePictureBackdropShown(true);
+  const openDeleteChatHistoryBackdrop = () =>
+    setIsDeleteChatHistoryBackdropShown(true);
 
   const closeChangePasswordBackdrop = () => setIsChangePasswordOpen(false);
   const closeDeleteAccountBackdrop = () => setIsDeleteBackdropShown(false);
   const closeSelectAvatarBackdrop = () => setIsSelectAvatarBackdropShown(false);
   const closeDeletePictureBackdrop = () =>
     setIsDeletePictureBackdropShown(false);
+  const closeDeleteChatHistoryBackdrop = () =>
+    setIsDeleteChatHistoryBackdropShown(false);
 
   return (
     <Screen>
@@ -42,6 +51,7 @@ export const UserDetails = ({ navigation }) => {
         openChangePasswordBackdrop={openChangePasswordBackdrop}
         openSelectAvatarBackdrop={openSelectAvatarBackdrop}
         openDeletePictureBackdrop={openDeletePictureBackdrop}
+        openDeleteChatHistoryBackdrop={openDeleteChatHistoryBackdrop}
       />
       <SelectAvatar
         isOpen={isSelectAvatarBackdropShown}
@@ -59,6 +69,10 @@ export const UserDetails = ({ navigation }) => {
         isOpen={isDeletePictureBackdropShown}
         onClose={closeDeletePictureBackdrop}
       />
+      <DeleteChatHistory
+        isOpen={isDeleteChatHistoryBackdropShown}
+        onClose={closeDeleteChatHistoryBackdrop}
+      />
     </Screen>
   );
 };

src/services/client.js

@@ -164,6 +164,13 @@ async function addQuestionVote(answerId, vote) {
   return response;
 }
 
+async function deleteChatHistory() {
+  const response = await http.put(`${API_ENDPOINT}/chat-history`, {
+    time: JSON.stringify(new Date().getTime()),
+  });
+  return response;
+}
+
 const exportedFunctions = {
   addMoodTrack,
   getClientData,
@@ -188,6 +195,7 @@ const exportedFunctions = {
   getClientQuestions,
   getQuestions,
   addQuestionVote,
+  deleteChatHistory,
 };
 
 export default exportedFunctions;