diff --git a/src/components/guide-tool/views/GuideToolOngoingView.tsx b/src/components/guide-tool/views/GuideToolOngoingView.tsx index 080de332f..b85c15ef7 100644 --- a/src/components/guide-tool/views/GuideToolOngoingView.tsx +++ b/src/components/guide-tool/views/GuideToolOngoingView.tsx @@ -1,8 +1,8 @@ import { GuideSessionGetRequesterRoomMessageComposer, GuideSessionInviteRequesterMessageComposer, GuideSessionMessageMessageComposer, GuideSessionRequesterRoomMessageEvent, GuideSessionResolvedMessageComposer } from '@nitrots/nitro-renderer'; import { FC, KeyboardEvent, useCallback, useEffect, useRef, useState } from 'react'; -import { GetSessionDataManager, GuideToolMessageGroup, LocalizeText, SendMessageComposer, TryVisitRoom } from '../../../api'; +import { GetSessionDataManager, GuideToolMessageGroup, LocalizeText, ReportType, SendMessageComposer, TryVisitRoom } from '../../../api'; import { Base, Button, ButtonGroup, Column, Flex, LayoutAvatarImageView, Text } from '../../../common'; -import { useMessageEvent } from '../../../hooks'; +import { useHelp, useMessageEvent } from '../../../hooks'; interface GuideToolOngoingViewProps { @@ -21,6 +21,7 @@ export const GuideToolOngoingView: FC = props => const { isGuide = false, userId = 0, userName = null, userFigure = null, isTyping = false, messageGroups = [] } = props; const [ messageText, setMessageText ] = useState(''); + const { report = null } = useHelp(); useEffect(() => { @@ -83,7 +84,7 @@ export const GuideToolOngoingView: FC = props => { userName } { LocalizeText('guide.help.request.user.ongoing.guide.desc') } } - + diff --git a/src/components/guide-tool/views/GuideToolUserFeedbackView.tsx b/src/components/guide-tool/views/GuideToolUserFeedbackView.tsx index 9ec72807e..87bf9b3c4 100644 --- a/src/components/guide-tool/views/GuideToolUserFeedbackView.tsx +++ b/src/components/guide-tool/views/GuideToolUserFeedbackView.tsx @@ -16,13 +16,15 @@ export const GuideToolUserFeedbackView: FC = pro return ( - - - { userName } - { LocalizeText('guide.help.request.user.feedback.guide.desc') } - - - + { userName && (userName.length > 0) && + + + { userName } + { LocalizeText('guide.help.request.user.feedback.guide.desc') } + + + + } { LocalizeText('guide.help.request.user.feedback.closed.title') } { LocalizeText('guide.help.request.user.feedback.closed.desc') } diff --git a/src/components/help/views/ReportSummaryView.tsx b/src/components/help/views/ReportSummaryView.tsx index 1aa04031f..c387ffe47 100644 --- a/src/components/help/views/ReportSummaryView.tsx +++ b/src/components/help/views/ReportSummaryView.tsx @@ -1,4 +1,4 @@ -import { CallForHelpFromForumMessageMessageComposer, CallForHelpFromForumThreadMessageComposer, CallForHelpFromIMMessageComposer, CallForHelpFromPhotoMessageComposer, CallForHelpMessageComposer } from '@nitrots/nitro-renderer'; +import { CallForHelpFromForumMessageMessageComposer, CallForHelpFromForumThreadMessageComposer, CallForHelpFromIMMessageComposer, CallForHelpFromPhotoMessageComposer, CallForHelpMessageComposer, GuideSessionReportMessageComposer } from '@nitrots/nitro-renderer'; import { FC } from 'react'; import { GetSessionDataManager, LocalizeText, ReportType, SendMessageComposer } from '../../../api'; import { Button, Column, Text } from '../../../common'; @@ -38,6 +38,9 @@ export const ReportSummaryView: FC<{}> = props => case ReportType.PHOTO: SendMessageComposer(new CallForHelpFromPhotoMessageComposer(activeReport.extraData, activeReport.cfhTopic, activeReport.roomId, GetSessionDataManager().userId, activeReport.roomObjectId)); break; + case ReportType.GUIDE: + SendMessageComposer(new GuideSessionReportMessageComposer('')); + break; } setActiveReport(null); diff --git a/src/hooks/chat-history/useChatHistory.ts b/src/hooks/chat-history/useChatHistory.ts index a2f3c3464..65cdd6724 100644 --- a/src/hooks/chat-history/useChatHistory.ts +++ b/src/hooks/chat-history/useChatHistory.ts @@ -97,7 +97,7 @@ const useChatHistoryState = () => addMessengerEntry({ id: -1, webId: parser.senderId, entityId: -1, name: '', message: parser.messageText, roomId: -1, timestamp: MessengerHistoryCurrentDate(), type: ChatEntryType.TYPE_IM }); }); - + return { addChatEntry, chatHistory, roomHistory, messengerHistory }; } diff --git a/src/hooks/help/useHelp.ts b/src/hooks/help/useHelp.ts index 9a67fb7fd..996e8e34d 100644 --- a/src/hooks/help/useHelp.ts +++ b/src/hooks/help/useHelp.ts @@ -57,6 +57,8 @@ const useHelpState = () => case ReportType.PHOTO: break; case ReportType.GUIDE: + newReport.reportedUserId = options.reportedUserId; + newReport.currentStep = ReportState.REPORT_SUMMARY; break; }