From 41ca0666cedc3ac6f1153c9d64c8aa51f6503f60 Mon Sep 17 00:00:00 2001
From: Audric Ackermann <audric@loki.network>
Date: Wed, 2 Aug 2023 10:19:33 +0200
Subject: [PATCH] chore: remove () => void for misused promises

---
 ts/components/SessionScrollButton.tsx         |  3 ++-
 ts/components/basic/SessionInput.tsx          |  3 ++-
 ts/components/calling/CallButtons.tsx         |  3 ++-
 ts/components/calling/IncomingCallDialog.tsx  |  5 ++--
 .../SessionMessagesListContainer.tsx          |  3 ++-
 .../conversation/SessionRightPanel.tsx        | 10 ++++----
 .../composition/CompositionBox.tsx            | 24 +++++++++----------
 .../composition/CompositionButtons.tsx        |  9 +++----
 .../message-content/ClickToTrustSender.tsx    |  3 ++-
 .../message/message-content/MessageAvatar.tsx |  7 ++----
 .../MessageContentWithStatus.tsx              |  3 ++-
 .../message-content/MessageContextMenu.tsx    | 11 +++++----
 .../message/message-content/MessageQuote.tsx  |  3 ++-
 ts/components/dialog/EditProfileDialog.tsx    |  3 ++-
 .../conversation-list-item/HeaderItem.tsx     |  3 ++-
 .../leftpane/overlay/OverlayCommunity.tsx     |  6 ++---
 .../overlay/choose-action/ContactRow.tsx      |  3 ++-
 ts/components/menu/Menu.tsx                   | 15 ++++++++----
 ts/components/registration/SignUpTab.tsx      |  5 ++--
 .../settings/SessionSettingListItem.tsx       |  3 ++-
 ts/node/menu.ts                               |  3 ++-
 ts/state/ducks/modalDialog.tsx                |  3 ++-
 ts/types/Util.ts                              |  2 ++
 ts/util/expiringMessages.ts                   |  6 +++--
 24 files changed, 83 insertions(+), 56 deletions(-)

diff --git a/ts/components/SessionScrollButton.tsx b/ts/components/SessionScrollButton.tsx
index 4019faaf2..5c7543da2 100644
--- a/ts/components/SessionScrollButton.tsx
+++ b/ts/components/SessionScrollButton.tsx
@@ -4,6 +4,7 @@ import styled from 'styled-components';
 import { getShowScrollButton } from '../state/selectors/conversations';
 
 import { SessionIconButton } from './icon';
+import { Noop } from '../types/Util';
 
 const SessionScrollButtonDiv = styled.div`
   position: fixed;
@@ -17,7 +18,7 @@ const SessionScrollButtonDiv = styled.div`
   }
 `;
 
-export const SessionScrollButton = (props: { onClickScrollBottom: () => void }) => {
+export const SessionScrollButton = (props: { onClickScrollBottom: Noop }) => {
   const show = useSelector(getShowScrollButton);
 
   return (
diff --git a/ts/components/basic/SessionInput.tsx b/ts/components/basic/SessionInput.tsx
index e3425173d..2143b7413 100644
--- a/ts/components/basic/SessionInput.tsx
+++ b/ts/components/basic/SessionInput.tsx
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 
 import classNames from 'classnames';
 import { SessionIconButton } from '../icon';
+import { Noop } from '../../types/Util';
 
 type Props = {
   label?: string;
@@ -44,7 +45,7 @@ const ErrorItem = (props: { error: string | undefined }) => {
   );
 };
 
-const ShowHideButton = (props: { toggleForceShow: () => void }) => {
+const ShowHideButton = (props: { toggleForceShow: Noop }) => {
   return <SessionIconButton iconType="eye" iconSize="medium" onClick={props.toggleForceShow} />;
 };
 
diff --git a/ts/components/calling/CallButtons.tsx b/ts/components/calling/CallButtons.tsx
index acb84dae8..a599c3092 100644
--- a/ts/components/calling/CallButtons.tsx
+++ b/ts/components/calling/CallButtons.tsx
@@ -282,7 +282,8 @@ export const HangUpButton = ({ isFullScreen }: { isFullScreen: boolean }) => {
         iconType="hangup"
         iconColor="var(--danger-color)"
         borderRadius="50%"
-        onClick={() => void handleEndCall()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onClick={handleEndCall}
         margin="10px"
         dataTestId="end-call"
       />
diff --git a/ts/components/calling/IncomingCallDialog.tsx b/ts/components/calling/IncomingCallDialog.tsx
index 98dd11908..ccaba5c46 100644
--- a/ts/components/calling/IncomingCallDialog.tsx
+++ b/ts/components/calling/IncomingCallDialog.tsx
@@ -35,14 +35,15 @@ export const IncomingCallDialog = () => {
   useEffect(() => {
     let timeout: NodeJS.Timeout;
     if (incomingCallFromPubkey) {
-      timeout = global.setTimeout(() => {
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      timeout = global.setTimeout(async () => {
         if (incomingCallFromPubkey) {
           window.log.info(
             `call missed with ${ed25519Str(
               incomingCallFromPubkey
             )} as the dialog was not interacted with for ${callTimeoutMs} ms`
           );
-          void CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
+          await CallManager.USER_rejectIncomingCallRequest(incomingCallFromPubkey);
         }
       }, callTimeoutMs);
     }
diff --git a/ts/components/conversation/SessionMessagesListContainer.tsx b/ts/components/conversation/SessionMessagesListContainer.tsx
index 6fde12df2..92941a56d 100644
--- a/ts/components/conversation/SessionMessagesListContainer.tsx
+++ b/ts/components/conversation/SessionMessagesListContainer.tsx
@@ -144,7 +144,8 @@ class SessionMessagesListContainerInner extends React.Component<Props> {
         </ScrollToLoadedMessageContext.Provider>
 
         <SessionScrollButton
-          onClickScrollBottom={() => void this.props.scrollToNow()}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClickScrollBottom={this.props.scrollToNow}
           key="scroll-down-button"
         />
       </StyledMessagesContainer>
diff --git a/ts/components/conversation/SessionRightPanel.tsx b/ts/components/conversation/SessionRightPanel.tsx
index 9bbb628de..8117d4e03 100644
--- a/ts/components/conversation/SessionRightPanel.tsx
+++ b/ts/components/conversation/SessionRightPanel.tsx
@@ -301,8 +301,9 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={() => {
-            void showUpdateGroupNameByConvoId(selectedConvoKey);
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={async () => {
+            await showUpdateGroupNameByConvoId(selectedConvoKey);
           }}
         >
           {isPublic ? window.i18n('editGroup') : window.i18n('editGroupName')}
@@ -335,8 +336,9 @@ export const SessionRightPanelWithDetails = () => {
         <StyledGroupSettingsItem
           className="group-settings-item"
           role="button"
-          onClick={() => {
-            void showUpdateGroupMembersByConvoId(selectedConvoKey);
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={async () => {
+            await showUpdateGroupMembersByConvoId(selectedConvoKey);
           }}
         >
           {window.i18n('groupMembers')}
diff --git a/ts/components/conversation/composition/CompositionBox.tsx b/ts/components/conversation/composition/CompositionBox.tsx
index c4b4eb436..689a3025c 100644
--- a/ts/components/conversation/composition/CompositionBox.tsx
+++ b/ts/components/conversation/composition/CompositionBox.tsx
@@ -404,7 +404,8 @@ class CompositionBoxInner extends React.Component<Props, State> {
     return (
       <SessionRecording
         sendVoiceMessage={this.sendVoiceMessage}
-        onLoadVoiceNoteView={() => void this.onLoadVoiceNoteView()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onLoadVoiceNoteView={this.onLoadVoiceNoteView}
         onExitVoiceNoteView={this.onExitVoiceNoteView}
       />
     );
@@ -413,22 +414,20 @@ class CompositionBoxInner extends React.Component<Props, State> {
   private renderCompositionView() {
     const { showEmojiPanel } = this.state;
     const { typingEnabled } = this.props;
+    /* eslint-disable @typescript-eslint/no-misused-promises */
 
     return (
       <>
         {typingEnabled && <AddStagedAttachmentButton onClick={this.onChooseAttachment} />}
-
         <input
           className="hidden"
           placeholder="Attachment"
           multiple={true}
           ref={this.fileInput}
           type="file"
-          onChange={() => void this.onChoseAttachment()}
+          onChange={this.onChoseAttachment}
         />
-
-        {typingEnabled && <StartRecordingButton onClick={() => void this.onLoadVoiceNoteView()} />}
-
+        {typingEnabled && <StartRecordingButton onClick={this.onLoadVoiceNoteView} />}
         <StyledSendMessageInput
           role="main"
           onClick={this.focusCompositionBox} // used to focus on the textarea when clicking in its container
@@ -439,25 +438,24 @@ class CompositionBoxInner extends React.Component<Props, State> {
         >
           {this.renderTextArea()}
         </StyledSendMessageInput>
-
         {typingEnabled && (
           <ToggleEmojiButton ref={this.emojiPanelButton} onClick={this.toggleEmojiPanel} />
         )}
-        <SendMessageButton onClick={() => void this.onSendMessage()} />
-
+        <SendMessageButton onClick={this.onSendMessage} />
         {typingEnabled && showEmojiPanel && (
           <StyledEmojiPanelContainer role="button">
             <SessionEmojiPanel
               ref={this.emojiPanel}
               show={showEmojiPanel}
               onEmojiClicked={this.onEmojiClick}
-              onKeyDown={e => void this.onKeyDown(e)}
+              onKeyDown={this.onKeyDown}
             />
           </StyledEmojiPanelContainer>
         )}
       </>
     );
   }
+  /* eslint-enable @typescript-eslint/no-misused-promises */
 
   private renderTextArea() {
     const { i18n } = window;
@@ -492,8 +490,10 @@ class CompositionBoxInner extends React.Component<Props, State> {
       <MentionsInput
         value={draft}
         onChange={this.onChange}
-        onKeyDown={e => void this.onKeyDown(e)}
-        onKeyUp={() => void this.onKeyUp()}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onKeyDown={this.onKeyDown}
+        // eslint-disable-next-line @typescript-eslint/no-misused-promises
+        onKeyUp={this.onKeyUp}
         placeholder={messagePlaceHolder}
         spellCheck={true}
         inputRef={this.textarea}
diff --git a/ts/components/conversation/composition/CompositionButtons.tsx b/ts/components/conversation/composition/CompositionButtons.tsx
index bd651c3f5..f88cdde7a 100644
--- a/ts/components/conversation/composition/CompositionButtons.tsx
+++ b/ts/components/conversation/composition/CompositionButtons.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import styled from 'styled-components';
 import { SessionIconButton } from '../../icon';
+import { Noop } from '../../../types/Util';
 
 const StyledChatButtonContainer = styled.div`
   .session-icon-button {
@@ -14,7 +15,7 @@ const StyledChatButtonContainer = styled.div`
   }
 `;
 
-export const AddStagedAttachmentButton = (props: { onClick: () => void }) => {
+export const AddStagedAttachmentButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer>
       <SessionIconButton
@@ -31,7 +32,7 @@ export const AddStagedAttachmentButton = (props: { onClick: () => void }) => {
   );
 };
 
-export const StartRecordingButton = (props: { onClick: () => void }) => {
+export const StartRecordingButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer>
       <SessionIconButton
@@ -49,7 +50,7 @@ export const StartRecordingButton = (props: { onClick: () => void }) => {
 };
 
 // eslint-disable-next-line react/display-name
-export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: () => void }>(
+export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: Noop }>(
   (props, ref) => {
     return (
       <StyledChatButtonContainer>
@@ -69,7 +70,7 @@ export const ToggleEmojiButton = React.forwardRef<HTMLDivElement, { onClick: ()
   }
 );
 
-export const SendMessageButton = (props: { onClick: () => void }) => {
+export const SendMessageButton = (props: { onClick: Noop }) => {
   return (
     <StyledChatButtonContainer className="send-message-button">
       <SessionIconButton
diff --git a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
index 88cb65155..25afee8a7 100644
--- a/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
+++ b/ts/components/conversation/message/message-content/ClickToTrustSender.tsx
@@ -111,7 +111,8 @@ export const ClickToTrustSender = (props: { messageId: string }) => {
   };
 
   return (
-    <StyledTrustSenderUI onClick={e => void openConfirmationModal(e)}>
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <StyledTrustSenderUI onClick={openConfirmationModal}>
       <SessionIcon iconSize="small" iconType="gallery" />
       <ClickToDownload>{window.i18n('clickToTrustContact')}</ClickToDownload>
     </StyledTrustSenderUI>
diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx
index 0994be253..375b3158a 100644
--- a/ts/components/conversation/message/message-content/MessageAvatar.tsx
+++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx
@@ -131,6 +131,7 @@ export const MessageAvatar = (props: Props) => {
   if (!lastMessageOfSeries) {
     return <div style={{ marginInlineEnd: '60px' }} key={`msg-avatar-${sender}`} />;
   }
+  /* eslint-disable @typescript-eslint/no-misused-promises */
 
   return (
     <StyledAvatar
@@ -139,11 +140,7 @@ export const MessageAvatar = (props: Props) => {
         visibility: hideAvatar ? 'hidden' : undefined,
       }}
     >
-      <Avatar
-        size={AvatarSize.S}
-        onAvatarClick={() => void onMessageAvatarClick()}
-        pubkey={sender}
-      />
+      <Avatar size={AvatarSize.S} onAvatarClick={onMessageAvatarClick} pubkey={sender} />
       {isSenderAdmin && <CrownIcon />}
     </StyledAvatar>
   );
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index ad0e1bff9..d3d99fb35 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -147,7 +147,8 @@ export const MessageContentWithStatuses = (props: Props) => {
       {enableReactions && (
         <MessageReactions
           messageId={messageId}
-          onClick={emoji => void handleMessageReaction(emoji)}
+          // eslint-disable-next-line @typescript-eslint/no-misused-promises
+          onClick={handleMessageReaction}
           popupReaction={popupReaction}
           setPopupReaction={setPopupReaction}
           onPopupClick={handlePopupClick}
diff --git a/ts/components/conversation/message/message-content/MessageContextMenu.tsx b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
index ec9b45850..407ee8220 100644
--- a/ts/components/conversation/message/message-content/MessageContextMenu.tsx
+++ b/ts/components/conversation/message/message-content/MessageContextMenu.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 
 import { animation, Item, Menu, useContextMenu } from 'react-contexify';
@@ -200,7 +201,7 @@ const RetryItem = ({ messageId }: MessageId) => {
       await found.retrySend();
     }
   }, [messageId]);
-  return showRetry ? <Item onClick={() => void onRetry()}>{window.i18n('resend')}</Item> : null;
+  return showRetry ? <Item onClick={onRetry}>{window.i18n('resend')}</Item> : null;
 };
 
 export const MessageContextMenu = (props: Props) => {
@@ -349,7 +350,8 @@ export const MessageContextMenu = (props: Props) => {
         <StyledEmojiPanelContainer role="button" x={mouseX} y={mouseY}>
           <SessionEmojiPanel
             ref={emojiPanelRef}
-            onEmojiClicked={e => void onEmojiClick(e)}
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            onEmojiClicked={onEmojiClick}
             show={showEmojiPanel}
             isModal={true}
             onKeyDown={onEmojiKeyDown}
@@ -364,7 +366,8 @@ export const MessageContextMenu = (props: Props) => {
           animation={animation.fade}
         >
           {enableReactions && (
-            <MessageReactBar action={e => void onEmojiClick(e)} additionalAction={onShowEmoji} />
+            // eslint-disable-next-line @typescript-eslint/no-misused-promises
+            <MessageReactBar action={onEmojiClick} additionalAction={onShowEmoji} />
           )}
           <SaveAttachment messageId={messageId} />
 
@@ -373,7 +376,7 @@ export const MessageContextMenu = (props: Props) => {
             <Item onClick={onReply}>{window.i18n('replyToMessage')}</Item>
           )}
           {(!isPublic || isOutgoing) && (
-            <Item onClick={() => void onShowDetail()}>{window.i18n('moreInformation')}</Item>
+            <Item onClick={onShowDetail}>{window.i18n('moreInformation')}</Item>
           )}
           <RetryItem messageId={messageId} />
           {isDeletable ? <Item onClick={onSelect}>{selectMessageText}</Item> : null}
diff --git a/ts/components/conversation/message/message-content/MessageQuote.tsx b/ts/components/conversation/message/message-content/MessageQuote.tsx
index 054c9707c..84ab7e082 100644
--- a/ts/components/conversation/message/message-content/MessageQuote.tsx
+++ b/ts/components/conversation/message/message-content/MessageQuote.tsx
@@ -98,7 +98,8 @@ export const MessageQuote = (props: Props) => {
 
   return (
     <Quote
-      onClick={e => void onQuoteClick(e)}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onClick={onQuoteClick}
       text={quote?.text}
       attachment={quote?.attachment}
       isIncoming={direction === 'incoming'}
diff --git a/ts/components/dialog/EditProfileDialog.tsx b/ts/components/dialog/EditProfileDialog.tsx
index 32e4e2d8a..a1d38b080 100644
--- a/ts/components/dialog/EditProfileDialog.tsx
+++ b/ts/components/dialog/EditProfileDialog.tsx
@@ -163,7 +163,8 @@ export class EditProfileDialog extends React.Component<object, State> {
             <div
               className="image-upload-section"
               role="button"
-              onClick={() => void this.fireInputEvent()}
+              // eslint-disable-next-line @typescript-eslint/no-misused-promises
+              onClick={this.fireInputEvent}
               data-testid="image-upload-section"
             />
             <div
diff --git a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
index 6061382f7..1f435bfb1 100644
--- a/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
+++ b/ts/components/leftpane/conversation-list-item/HeaderItem.tsx
@@ -148,7 +148,8 @@ const AtSymbol = ({ convoId }: { convoId: string }) => {
   return hasMentionedUs && hasUnread ? (
     <MentionAtSymbol
       title="Open to latest mention"
-      onMouseDown={e => void openConvoToLastMention(e, convoId)}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onMouseDown={async e => openConvoToLastMention(e, convoId)}
     >
       @
     </MentionAtSymbol>
diff --git a/ts/components/leftpane/overlay/OverlayCommunity.tsx b/ts/components/leftpane/overlay/OverlayCommunity.tsx
index f64d1b3fe..1b6080140 100644
--- a/ts/components/leftpane/overlay/OverlayCommunity.tsx
+++ b/ts/components/leftpane/overlay/OverlayCommunity.tsx
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-misused-promises */
 import React, { useState } from 'react';
 import useKey from 'react-use/lib/useKey';
 import { useDispatch, useSelector } from 'react-redux';
@@ -86,7 +87,6 @@ export const OverlayCommunity = () => {
   return (
     <div className="module-left-pane-overlay">
       <OverlayHeader title={title} subtitle={subtitle} />
-
       <div className="create-group-name-input">
         <SessionIdEditable
           editable={true}
@@ -98,11 +98,9 @@ export const OverlayCommunity = () => {
           onPressEnter={onTryJoinRoom}
         />
       </div>
-
       <SessionButton text={buttonText} disabled={!groupUrl} onClick={onTryJoinRoom} />
-
       <SessionSpinner loading={loading} />
-      <SessionJoinableRooms onJoinClick={url => void onTryJoinRoom(url)} alreadyJoining={loading} />
+      <SessionJoinableRooms onJoinClick={onTryJoinRoom} alreadyJoining={loading} />
     </div>
   );
 };
diff --git a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
index 826d41352..be65ad673 100644
--- a/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
+++ b/ts/components/leftpane/overlay/choose-action/ContactRow.tsx
@@ -86,7 +86,8 @@ export const ContactRow = (props: Props) => {
   return (
     <StyledRowContainer
       style={style}
-      onClick={() => void openConversationWithMessages({ conversationKey: id, messageId: null })}
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      onClick={async () => openConversationWithMessages({ conversationKey: id, messageId: null })}
     >
       <AvatarItem id={id} displayName={displayName} />
       <StyledContactRowName data-testid="module-conversation__user__profile-name">
diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx
index 80430bbce..2164df87b 100644
--- a/ts/components/menu/Menu.tsx
+++ b/ts/components/menu/Menu.tsx
@@ -357,7 +357,10 @@ export const MarkAllReadMenuItem = (): JSX.Element | null => {
   const isIncomingRequest = useIsIncomingRequest(convoId);
   if (!isIncomingRequest && !PubKey.isBlinded(convoId)) {
     return (
-      <Item onClick={() => void markAllReadByConvoId(convoId)}>{window.i18n('markAllAsRead')}</Item>
+      // eslint-disable-next-line @typescript-eslint/no-misused-promises
+      <Item onClick={async () => markAllReadByConvoId(convoId)}>
+        {window.i18n('markAllAsRead')}
+      </Item>
     );
   }
   return null;
@@ -379,8 +382,9 @@ export const BlockMenuItem = (): JSX.Element | null => {
   if (!isMe && isPrivate && !isIncomingRequest && !PubKey.isBlinded(convoId)) {
     const blockTitle = isBlocked ? window.i18n('unblock') : window.i18n('block');
     const blockHandler = isBlocked
-      ? () => void unblockConvoById(convoId)
-      : () => void blockConvoById(convoId);
+      ? async () => unblockConvoById(convoId)
+      : async () => blockConvoById(convoId);
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
     return <Item onClick={blockHandler}>{blockTitle}</Item>;
   }
   return null;
@@ -398,7 +402,10 @@ export const ClearNicknameMenuItem = (): JSX.Element | null => {
   }
 
   return (
-    <Item onClick={() => void clearNickNameByConvoId(convoId)}>{window.i18n('clearNickname')}</Item>
+    // eslint-disable-next-line @typescript-eslint/no-misused-promises
+    <Item onClick={async () => clearNickNameByConvoId(convoId)}>
+      {window.i18n('clearNickname')}
+    </Item>
   );
 };
 
diff --git a/ts/components/registration/SignUpTab.tsx b/ts/components/registration/SignUpTab.tsx
index 9a5f27ab8..a54d0a01c 100644
--- a/ts/components/registration/SignUpTab.tsx
+++ b/ts/components/registration/SignUpTab.tsx
@@ -7,6 +7,7 @@ import { RegistrationContext, RegistrationPhase, signUp } from './RegistrationSt
 import { RegistrationUserDetails } from './RegistrationUserDetails';
 import { sanitizeDisplayNameOrToast, SignInMode } from './SignInTab';
 import { TermsAndConditions } from './TermsAndConditions';
+import { Noop } from '../../types/Util';
 
 export enum SignUpMode {
   Default,
@@ -22,7 +23,7 @@ const ContinueSignUpButton = ({ continueSignUp }: { continueSignUp: any }) => {
   return <SessionButton onClick={continueSignUp} text={window.i18n('continue')} />;
 };
 
-const SignUpDefault = (props: { createSessionID: () => void }) => {
+const SignUpDefault = (props: { createSessionID: Noop }) => {
   return (
     <div className="session-registration__content">
       <CreateSessionIdButton createSessionID={props.createSessionID} />
@@ -46,7 +47,7 @@ export const GoBackMainMenuButton = () => {
   );
 };
 
-const SignUpSessionIDShown = (props: { continueSignUp: () => void }) => {
+const SignUpSessionIDShown = (props: { continueSignUp: Noop }) => {
   return (
     <div className="session-registration__content">
       <Flex flexDirection="row" container={true} alignItems="center">
diff --git a/ts/components/settings/SessionSettingListItem.tsx b/ts/components/settings/SessionSettingListItem.tsx
index c2b111b23..20311ff22 100644
--- a/ts/components/settings/SessionSettingListItem.tsx
+++ b/ts/components/settings/SessionSettingListItem.tsx
@@ -10,6 +10,7 @@ import {
 import { SessionToggle } from '../basic/SessionToggle';
 import { SessionConfirmDialogProps } from '../dialog/SessionConfirm';
 import { SessionIconButton } from '../icon';
+import { Noop } from '../../types/Util';
 
 type ButtonSettingsProps = {
   title?: string;
@@ -112,7 +113,7 @@ export const SessionSettingsItemWrapper = (props: {
   );
 };
 
-export const SessionSettingsTitleWithLink = (props: { title: string; onClick: () => void }) => {
+export const SessionSettingsTitleWithLink = (props: { title: string; onClick: Noop }) => {
   const { onClick, title } = props;
   return (
     <StyledSettingItemClickable onClick={onClick}>
diff --git a/ts/node/menu.ts b/ts/node/menu.ts
index 4c7573b3c..fb2862e1b 100644
--- a/ts/node/menu.ts
+++ b/ts/node/menu.ts
@@ -1,5 +1,6 @@
 import { isString } from 'lodash';
 import { LocaleMessagesType } from './locale';
+import { Noop } from '../types/Util';
 
 export const createTemplate = (
   options: {
@@ -162,7 +163,7 @@ export const createTemplate = (
 function updateForMac(
   template: any,
   messages: LocaleMessagesType,
-  options: { showAbout: () => void; showWindow: () => void }
+  options: { showAbout: Noop; showWindow: Noop }
 ) {
   const { showAbout, showWindow } = options;
 
diff --git a/ts/state/ducks/modalDialog.tsx b/ts/state/ducks/modalDialog.tsx
index 37053dcfc..be1cb8b92 100644
--- a/ts/state/ducks/modalDialog.tsx
+++ b/ts/state/ducks/modalDialog.tsx
@@ -1,6 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { SessionConfirmDialogProps } from '../../components/dialog/SessionConfirm';
 import { PasswordAction } from '../../components/dialog/SessionPasswordDialog';
+import { Noop } from '../../types/Util';
 
 export type BanType = 'ban' | 'unban';
 
@@ -22,7 +23,7 @@ export type OnionPathModalState = EditProfileModalState;
 export type RecoveryPhraseModalState = EditProfileModalState;
 export type DeleteAccountModalState = EditProfileModalState;
 
-export type SessionPasswordModalState = { passwordAction: PasswordAction; onOk: () => void } | null;
+export type SessionPasswordModalState = { passwordAction: PasswordAction; onOk: Noop } | null;
 
 export type UserDetailsModalState = {
   conversationId: string;
diff --git a/ts/types/Util.ts b/ts/types/Util.ts
index ccea6b792..76f1d6800 100644
--- a/ts/types/Util.ts
+++ b/ts/types/Util.ts
@@ -7,3 +7,5 @@ export type RenderTextCallbackType = (options: {
 }) => JSX.Element;
 
 export type LocalizerType = (key: LocalizerKeys, values?: Array<string>) => string;
+
+export type Noop = () => void;
diff --git a/ts/util/expiringMessages.ts b/ts/util/expiringMessages.ts
index e7df1ba95..5d64e282d 100644
--- a/ts/util/expiringMessages.ts
+++ b/ts/util/expiringMessages.ts
@@ -98,7 +98,8 @@ async function checkExpiringMessages() {
   if (timeout) {
     global.clearTimeout(timeout);
   }
-  timeout = global.setTimeout(() => void destroyExpiredMessages(), wait);
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  timeout = global.setTimeout(async () => destroyExpiredMessages(), wait);
 }
 const throttledCheckExpiringMessages = throttle(checkExpiringMessages, 1000);
 
@@ -111,7 +112,8 @@ const initExpiringMessageListener = () => {
 
   void checkExpiringMessages();
 
-  initWallClockListener(() => void throttledCheckExpiringMessages());
+  // eslint-disable-next-line @typescript-eslint/no-misused-promises
+  initWallClockListener(async () => throttledCheckExpiringMessages());
   isInit = true;
 };