From cde30700e59730412320a4e866c236083522b546 Mon Sep 17 00:00:00 2001
From: "anton.buksa" <anton.buksa@infomaniak.com>
Date: Thu, 18 Jul 2024 15:14:21 +0200
Subject: [PATCH] fix trim js error in transcript popover

Changelog: fixed
---
 .../voice_message_attachment_player/index.tsx       | 10 ++++++----
 .../mattermost-redux/src/actions/channels.ts        | 13 ++++++-------
 webapp/platform/types/src/transcript.ts             |  2 +-
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/webapp/channels/src/components/voice_message_attachment_player/index.tsx b/webapp/channels/src/components/voice_message_attachment_player/index.tsx
index 3993c62a74..4f6dd7f846 100644
--- a/webapp/channels/src/components/voice_message_attachment_player/index.tsx
+++ b/webapp/channels/src/components/voice_message_attachment_player/index.tsx
@@ -63,8 +63,8 @@ function VoiceMessageAttachmentPlayer(props: Props) {
     const fetchTranscript = async () => {
         if (!hasFetchedTranscript) {
             setIsLoadingTranscript(true);
-            const result = await fetchTranscriptData(props.fileId)();
-            if (!(result as TranscriptData).text) {
+            const result = await fetchTranscriptData(props.fileId);
+            if (!result.text) {
                 setError(
                     <FormattedMessage
                         id='vocals.transcript.error'
@@ -73,8 +73,10 @@ function VoiceMessageAttachmentPlayer(props: Props) {
                 );
             }
             setIsLoadingTranscript(false);
-            setTranscript((result as TranscriptData).text.trim());
-            setTranscriptDatas((result as TranscriptData));
+            if (result.text) {
+                setTranscript(result.text.trim());
+            }
+            setTranscriptDatas(result);
             setHasFetchedTranscript(true);
         }
     };
diff --git a/webapp/channels/src/packages/mattermost-redux/src/actions/channels.ts b/webapp/channels/src/packages/mattermost-redux/src/actions/channels.ts
index 88fdd8b91d..c7296dc59d 100644
--- a/webapp/channels/src/packages/mattermost-redux/src/actions/channels.ts
+++ b/webapp/channels/src/packages/mattermost-redux/src/actions/channels.ts
@@ -18,6 +18,7 @@ import type {
 } from '@mattermost/types/channels';
 import type {ServerError} from '@mattermost/types/errors';
 import type {PreferenceType} from '@mattermost/types/preferences';
+import type {TranscriptData} from '@mattermost/types/transcript';
 
 import {ChannelTypes, PreferenceTypes, UserTypes} from 'mattermost-redux/action_types';
 import {Client4} from 'mattermost-redux/client';
@@ -1030,8 +1031,8 @@ export function getChannelsMemberCount(channelIds: string[]): ActionFuncAsync<Re
         let channelsMemberCount;
 
         try {
-                        channelsMemberCount = await Client4.getChannelsMemberCount(channelIds);
-                    } catch (error) {
+            channelsMemberCount = await Client4.getChannelsMemberCount(channelIds);
+        } catch (error) {
             forceLogoutIfNecessary(error, dispatch, getState);
             dispatch(logError(error));
             return {error};
@@ -1060,11 +1061,9 @@ export function notifyChannelMember(channelId: string, userIds: string[], postId
     };
 }
 
-export function fetchTranscriptData(fileId: string) {
-    return async () => {
-        const transcript = await Client4.getTranscript(fileId);
-        return transcript;
-    };
+export async function fetchTranscriptData(fileId: string): Promise<TranscriptData> {
+    const transcript = await Client4.getTranscript(fileId);
+    return transcript;
 }
 
 export function addChannelMember(channelId: string, userId: string, postRootId = ''): ActionFuncAsync<ChannelMembership> {
diff --git a/webapp/platform/types/src/transcript.ts b/webapp/platform/types/src/transcript.ts
index c2e2c6e833..ddc8ebdd08 100644
--- a/webapp/platform/types/src/transcript.ts
+++ b/webapp/platform/types/src/transcript.ts
@@ -6,5 +6,5 @@ export type TranscriptData = {
         text: string;
         start: number;
     }>;
-    text: string;
+    text?: string;
 };