fix: update rebase and fix lint issues

oxen-io · Mar 21, 2024 · 504d989 · 504d989
1 parent 11cdcdd
commit 504d989
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/ts/components/conversation/SessionConversation.tsx b/ts/components/conversation/SessionConversation.tsx
@@ -61,7 +61,6 @@ import { deleteMessagesByIdForEveryone } from '../../interactions/conversations/
 import { RightPanel, StyledRightPanelContainer } from './right-panel/RightPanel';
 
 const DEFAULT_JPEG_QUALITY = 0.85;
-// tslint:disable: jsx-curly-spacing
 interface State {
   isDraggingFile: boolean;
 }

diff --git a/ts/components/dialog/SessionConfirm.tsx b/ts/components/dialog/SessionConfirm.tsx
@@ -2,8 +2,8 @@ import { shell } from 'electron';
 import React, { Dispatch, useEffect, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
-import { useLastMessage } from '../../hooks/useParamSelector';
 import useKey from 'react-use/lib/useKey';
+import { useLastMessage } from '../../hooks/useParamSelector';
 import { MessageInteraction } from '../../interactions';
 import {
   ConversationInteractionStatus,
@@ -120,6 +120,14 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
     }
   };
 
+  useKey('Enter', () => {
+    void onClickOkHandler();
+  });
+
+  useKey('Escape', () => {
+    onClickCancelHandler();
+  });
+
   useEffect(() => {
     if (isLoading) {
       if (conversationId && lastMessage?.interactionType) {
@@ -136,14 +144,6 @@ export const SessionConfirm = (props: SessionConfirmDialogProps) => {
     return null;
   }
 
-  useKey('Enter', () => {
-    void onClickOkHandler();
-  });
-
-  useKey('Escape', () => {
-    onClickCancelHandler();
-  });
-
   if (shouldShowConfirm && !shouldShowConfirm) {
     return null;
   }