Enable Hide Contact for all users

ts/RemoteConfig.ts

@@ -20,8 +20,6 @@ export type ConfigKeyType =
   | 'desktop.cdsi.returnAcisWithoutUaks'
   | 'desktop.clientExpiration'
   | 'desktop.editMessageSend'
-  | 'desktop.contactManagement.beta'
-  | 'desktop.contactManagement'
   | 'desktop.groupCallOutboundRing2.beta'
   | 'desktop.groupCallOutboundRing2'
   | 'desktop.groupMultiTypingIndicators'

ts/components/ConversationList.tsx

@@ -185,7 +185,7 @@ export type PropsType = {
   onSelectConversation: (conversationId: string, messageId?: string) => void;
   onOutgoingAudioCallInConversation: (conversationId: string) => void;
   onOutgoingVideoCallInConversation: (conversationId: string) => void;
-  removeConversation?: (conversationId: string) => void;
+  removeConversation: (conversationId: string) => void;
   renderMessageSearchResult?: (id: string) => JSX.Element;
   showChooseGroupMembers: () => void;
   showConversation: ShowConversationType;

ts/components/LeftPane.stories.tsx

@@ -127,7 +127,6 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
   }
 
   const isUpdateDownloaded = false;
-  const isContactManagementEnabled = true;
 
   return {
     otherTabsUnreadStats: {
@@ -160,7 +159,6 @@ const useProps = (overrideProps: OverridePropsType = {}): PropsType => {
     hasUpdateDialog: false,
     unsupportedOSDialogType: undefined,
     isUpdateDownloaded,
-    isContactManagementEnabled,
     navTabsCollapsed: false,
 
     setChallengeStatus: action('setChallengeStatus'),

ts/components/LeftPane.tsx

@@ -68,7 +68,6 @@ export type PropsType = {
   hasRelinkDialog: boolean;
   hasUpdateDialog: boolean;
   isUpdateDownloaded: boolean;
-  isContactManagementEnabled: boolean;
   unsupportedOSDialogType: 'error' | 'warning' | undefined;
 
   // These help prevent invalid states. For example, we don't need the list of pinned
@@ -182,7 +181,6 @@ export function LeftPane({
   lookupConversationWithoutServiceId,
   isMacOS,
   isUpdateDownloaded,
-  isContactManagementEnabled,
   modeSpecificProps,
   navTabsCollapsed,
   onOutgoingAudioCallInConversation,
@@ -687,9 +685,7 @@ export function LeftPane({
                 onOutgoingVideoCallInConversation={
                   onOutgoingVideoCallInConversation
                 }
-                removeConversation={
-                  isContactManagementEnabled ? removeConversation : undefined
-                }
+                removeConversation={removeConversation}
                 renderMessageSearchResult={renderMessageSearchResult}
                 rowCount={helper.getRowCount()}
                 scrollBehavior={scrollBehavior}

ts/state/selectors/items.ts

@@ -167,27 +167,6 @@ export const getStoriesEnabled = createSelector(
   }
 );
 
-export const getContactManagementEnabled = createSelector(
-  getRemoteConfig,
-  (remoteConfig: ConfigMapType): boolean => {
-    if (isRemoteConfigFlagEnabled(remoteConfig, 'desktop.contactManagement')) {
-      return true;
-    }
-
-    if (
-      isRemoteConfigFlagEnabled(
-        remoteConfig,
-        'desktop.contactManagement.beta'
-      ) &&
-      isBeta(window.getVersion())
-    ) {
-      return true;
-    }
-
-    return false;
-  }
-);
-
 export const getSafetyNumberMode = createSelector(
   getRemoteConfig,
   getServerTimeSkew,

ts/state/smart/LeftPane.tsx

@@ -40,7 +40,6 @@ import { hasNetworkDialog } from '../selectors/network';
 import {
   getPreferredLeftPaneWidth,
   getUsernamesEnabled,
-  getContactManagementEnabled,
   getNavTabsCollapsed,
 } from '../selectors/items';
 import {
@@ -232,7 +231,6 @@ const mapStateToProps = (state: StateType) => {
     targetedMessageId: getTargetedMessage(state)?.id,
     showArchived: getShowArchived(state),
     getPreferredBadge: getPreferredBadgeSelector(state),
-    isContactManagementEnabled: getContactManagementEnabled(state),
     i18n: getIntl(state),
     isMacOS: getIsMacOS(state),
     regionCode: getRegionCode(state),