From 94f02dcc88e5413d992651949464bc3fcfde4905 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Wed, 14 Feb 2024 10:39:06 -0800
Subject: [PATCH] Fix conversation close shortcut

---
 ts/components/ChatsTab.tsx  | 7 ++-----
 ts/state/smart/ChatsTab.tsx | 1 -
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/ts/components/ChatsTab.tsx b/ts/components/ChatsTab.tsx
index f9bc40cfea1d..4ba91a8eb93b 100644
--- a/ts/components/ChatsTab.tsx
+++ b/ts/components/ChatsTab.tsx
@@ -15,7 +15,6 @@ type ChatsTabProps = Readonly<{
   hasFailedStorySends: boolean;
   navTabsCollapsed: boolean;
   onToggleNavTabsCollapse: (navTabsCollapsed: boolean) => void;
-  prevConversationId: string | undefined;
   renderConversationView: () => JSX.Element;
   renderLeftPane: (props: NavTabPanelProps) => JSX.Element;
   renderMiniPlayer: (options: { shouldFlow: boolean }) => JSX.Element;
@@ -30,7 +29,6 @@ export function ChatsTab({
   hasFailedStorySends,
   navTabsCollapsed,
   onToggleNavTabsCollapse,
-  prevConversationId,
   renderConversationView,
   renderLeftPane,
   renderMiniPlayer,
@@ -50,15 +48,14 @@ export function ChatsTab({
       </div>
       <div className="Inbox__conversation-stack">
         <div id="toast" />
-        {selectedConversationId && (
+        {selectedConversationId ? (
           <div
             className="Inbox__conversation"
             id={`conversation-${selectedConversationId}`}
           >
             {renderConversationView()}
           </div>
-        )}
-        {!prevConversationId && (
+        ) : (
           <div className="Inbox__no-conversation-open">
             {renderMiniPlayer({ shouldFlow: false })}
             <div className="module-splash-screen__logo module-img--128 module-logo-blue" />
diff --git a/ts/state/smart/ChatsTab.tsx b/ts/state/smart/ChatsTab.tsx
index 1af1d0aa0b75..863add30f275 100644
--- a/ts/state/smart/ChatsTab.tsx
+++ b/ts/state/smart/ChatsTab.tsx
@@ -150,7 +150,6 @@ export function SmartChatsTab(): JSX.Element {
       hasPendingUpdate={hasPendingUpdate}
       navTabsCollapsed={navTabsCollapsed}
       onToggleNavTabsCollapse={toggleNavTabsCollapse}
-      prevConversationId={prevConversationId}
       renderConversationView={renderConversationView}
       renderLeftPane={renderLeftPane}
       renderMiniPlayer={renderMiniPlayer}