From 8fca989736f94501faa31fee472c26bf3c78e665 Mon Sep 17 00:00:00 2001
From: Warrick Corfe-Tan <warrickct@gmail.com>
Date: Thu, 5 Aug 2021 09:41:50 +1000
Subject: [PATCH] Fixing delete button JSX evaluating to NaN

---
 stylesheets/_session_conversation.scss        |  1 -
 .../session/conversation/SessionRecording.tsx | 47 +++++++++++--------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/stylesheets/_session_conversation.scss b/stylesheets/_session_conversation.scss
index 8a8e97b37..c0224777b 100644
--- a/stylesheets/_session_conversation.scss
+++ b/stylesheets/_session_conversation.scss
@@ -428,7 +428,6 @@
     flex-shrink: 0;
 
     &.playback-timer {
-      margin-right: $session-margin-sm;
       animation: fadein $session-transition-duration;
 
       @media (-webkit-min-device-pixel-ratio: 1.6) {
diff --git a/ts/components/session/conversation/SessionRecording.tsx b/ts/components/session/conversation/SessionRecording.tsx
index ef1d439b2..9b471b4a8 100644
--- a/ts/components/session/conversation/SessionRecording.tsx
+++ b/ts/components/session/conversation/SessionRecording.tsx
@@ -106,7 +106,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
     } = this.state;
 
     const hasRecordingAndPaused = !isRecording && !isPlaying;
-    const hasRecording = this.audioElement?.duration && this.audioElement?.duration > 0;
+    const hasRecording = !!this.audioElement?.duration && this.audioElement?.duration > 0;
     const actionPauseAudio = !isRecording && !isPaused && isPlaying;
 
     // const actionDefault = !actionStopRecording && !actionPlayAudio && !actionPauseAudio;
@@ -123,16 +123,14 @@ class SessionRecordingInner extends React.Component<Props, State> {
       0;
     let displayTimeString = moment.utc(displayTimeMs).format('m:ss');
 
-    const recordingDurationMs = this.audioElement?.duration ? this.audioElement?.duration * 1000 : undefined;
+    const recordingDurationMs = this.audioElement?.duration ? this.audioElement?.duration * 1000 : 1;
 
-    let remainingTimeString;
+    let remainingTimeString = '';
     if (recordingDurationMs !== undefined) {
       remainingTimeString = ` / ${moment.utc(recordingDurationMs).format('m:ss')}`;
-      displayTimeString += remainingTimeString;
     }
 
     const actionPauseFn = isPlaying ? this.pauseAudio : this.stopRecordingStream;
-    // const actionPauseFn = isPlaying ? this.pauseAudio : this.onStopRecordingClick;
 
     return (
       <div role="main" className="session-recording" tabIndex={0} onKeyDown={this.onKeyDown}>
@@ -141,7 +139,10 @@ class SessionRecordingInner extends React.Component<Props, State> {
           onMouseEnter={this.handleHoverActions}
           onMouseLeave={this.handleUnhoverActions}
         >
-          {isRecording && (
+          <StyledFlexWrapper
+            flexDirection='row'
+            marginHorizontal={Constants.UI.SPACING.marginXs}
+          >{isRecording && (
             <SessionIconButton
               iconType={SessionIconType.Pause}
               iconSize={SessionIconSize.Medium}
@@ -149,17 +150,13 @@ class SessionRecordingInner extends React.Component<Props, State> {
               onClick={actionPauseFn}
             />
           )}
-          {actionPauseAudio && (
-            <SessionIconButton
-              iconType={SessionIconType.Pause}
-              iconSize={SessionIconSize.Medium}
-              onClick={actionPauseFn}
-            />
-          )}
-          <StyledFlexWrapper
-            flexDirection='row'
-            marginHorizontal={Constants.UI.SPACING.marginXs}
-          >
+            {actionPauseAudio && (
+              <SessionIconButton
+                iconType={SessionIconType.Pause}
+                iconSize={SessionIconSize.Medium}
+                onClick={actionPauseFn}
+              />
+            )}
             {hasRecordingAndPaused && (
               <SessionIconButton
                 iconType={SessionIconType.Play}
@@ -167,7 +164,7 @@ class SessionRecordingInner extends React.Component<Props, State> {
                 onClick={this.playAudio}
               />
             )}
-            {hasRecording && (
+            { hasRecording && (
               <SessionIconButton
                 iconType={SessionIconType.Delete2}
                 iconSize={SessionIconSize.Medium}
@@ -184,10 +181,20 @@ class SessionRecordingInner extends React.Component<Props, State> {
           )}
         </div>
 
-        {isRecording || (!isRecording && hasRecording) ?
+        { hasRecording && !isRecording ?
           <div className={classNames('session-recording--timer', !isRecording && 'playback-timer')}>
+            {
+              displayTimeString + remainingTimeString
+            }
+          </div>
+          :
+          null
+        }
+
+        {isRecording ?
+          <div className={classNames('session-recording--timer')}>
             {displayTimeString}
-            {isRecording && <div className="session-recording--timer-light" />}
+            <div className="session-recording--timer-light" />
           </div>
           :
           null