Various search UI improvements

ts/state/smart/LeftPane.tsx

@@ -13,6 +13,8 @@ import { missingCaseError } from '../../util/missingCaseError';
 import { ComposerStep, OneTimeModalState } from '../ducks/conversations';
 import {
   getIsSearchingInAConversation,
+  getQuery,
+  getSearchConversation,
   getSearchResults,
   getStartSearchCounter,
   isSearching,
@@ -91,9 +93,14 @@ const getModeSpecificProps = (
     case undefined:
       if (getShowArchived(state)) {
         const { archivedConversations } = getLeftPaneLists(state);
+        const searchConversation = getSearchConversation(state);
+        const searchTerm = getQuery(state);
         return {
           mode: LeftPaneMode.Archive,
           archivedConversations,
+          searchConversation,
+          searchTerm,
+          ...(searchConversation && searchTerm ? getSearchResults(state) : {}),
         };
       }
       if (isSearching(state)) {

ts/state/smart/MainHeader.tsx

@@ -1,4 +1,4 @@
-// Copyright 2019-2020 Signal Messenger, LLC
+// Copyright 2019-2021 Signal Messenger, LLC
 // SPDX-License-Identifier: AGPL-3.0-only
 
 import { connect } from 'react-redux';
@@ -9,8 +9,7 @@ import type { StateType } from '../reducer';
 
 import {
   getQuery,
-  getSearchConversationId,
-  getSearchConversationName,
+  getSearchConversation,
   getStartSearchCounter,
 } from '../selectors/search';
 import {
@@ -27,8 +26,7 @@ const mapStateToProps = (state: StateType) => {
     disabled: state.network.challengeStatus !== 'idle',
     hasPendingUpdate: Boolean(state.updates.didSnooze),
     searchTerm: getQuery(state),
-    searchConversationId: getSearchConversationId(state),
-    searchConversationName: getSearchConversationName(state),
+    searchConversation: getSearchConversation(state),
     selectedConversation: getSelectedConversation(state),
     startSearchCounter: getStartSearchCounter(state),
     regionCode: getRegionCode(state),