Remove safetyNumberAci remote configuration

ts/state/ducks/safetyNumber.ts

@@ -15,7 +15,6 @@ import {
 import * as log from '../../logging/log';
 import * as Errors from '../../types/errors';
 import type { StateType as RootStateType } from '../reducer';
-import { getSafetyNumberMode } from '../selectors/items';
 
 export type SafetyNumberContactType = ReadonlyDeep<{
   safetyNumbers: ReadonlyArray<SafetyNumberType>;
@@ -82,12 +81,9 @@ function clearSafetyNumber(contactId: string): ClearSafetyNumberActionType {
 function generate(
   contact: ConversationType
 ): ThunkAction<void, RootStateType, unknown, GenerateFulfilledActionType> {
-  return async (dispatch, getState) => {
+  return async dispatch => {
     try {
-      const safetyNumbers = await generateSafetyNumbers(
-        contact,
-        getSafetyNumberMode(getState(), { now: Date.now() })
-      );
+      const safetyNumbers = await generateSafetyNumbers(contact);
       dispatch({
         type: GENERATE_FULFILLED,
         payload: {
@@ -112,7 +108,7 @@ function toggleVerified(
   unknown,
   ToggleVerifiedPendingActionType | ToggleVerifiedFulfilledActionType
 > {
-  return async (dispatch, getState) => {
+  return async dispatch => {
     dispatch({
       type: TOGGLE_VERIFIED_PENDING,
       payload: {
@@ -132,10 +128,7 @@ function toggleVerified(
     } catch (err) {
       if (err.name === 'OutgoingIdentityKeyError') {
         await reloadProfiles(contact.id);
-        const safetyNumbers = await generateSafetyNumbers(
-          contact,
-          getSafetyNumberMode(getState(), { now: Date.now() })
-        );
+        const safetyNumbers = await generateSafetyNumbers(contact);
 
         dispatch({
           type: TOGGLE_VERIFIED_FULFILLED,

ts/state/selectors/items.ts

@@ -5,7 +5,6 @@ import { createSelector } from 'reselect';
 import { isInteger } from 'lodash';
 
 import { ITEM_NAME as UNIVERSAL_EXPIRE_TIMER_ITEM } from '../../util/universalExpireTimer';
-import { SafetyNumberMode } from '../../types/safetyNumber';
 import { innerIsBucketValueEnabled } from '../../RemoteConfig';
 import type { ConfigKeyType, ConfigMapType } from '../../RemoteConfig';
 import type { StateType } from '../reducer';
@@ -18,7 +17,7 @@ import type { AciString } from '../../types/ServiceId';
 import { DEFAULT_CONVERSATION_COLOR } from '../../types/Colors';
 import { getPreferredReactionEmoji as getPreferredReactionEmojiFromStoredValue } from '../../reactions/preferredReactionEmoji';
 import { isBeta } from '../../util/version';
-import { DurationInSeconds, SECOND } from '../../util/durations';
+import { DurationInSeconds } from '../../util/durations';
 import { generateUsernameLink } from '../../util/sgnlHref';
 import * as Bytes from '../../Bytes';
 import { getUserNumber, getUserACI } from './user';
@@ -167,40 +166,6 @@ export const getStoriesEnabled = createSelector(
   }
 );
 
-export const getSafetyNumberMode = createSelector(
-  getRemoteConfig,
-  getServerTimeSkew,
-  (_state: StateType, { now }: { now: number }) => now,
-  (
-    remoteConfig: ConfigMapType,
-    serverTimeSkew: number,
-    now: number
-  ): SafetyNumberMode => {
-    if (
-      !isRemoteConfigFlagEnabled(remoteConfig, 'desktop.safetyNumberAci') &&
-      !(
-        isRemoteConfigFlagEnabled(
-          remoteConfig,
-          'desktop.safetyNumberAci.beta'
-        ) && isBeta(window.getVersion())
-      )
-    ) {
-      return SafetyNumberMode.JustE164;
-    }
-
-    const timestampInSeconds = remoteConfig['global.safetyNumberAci']?.value;
-    if (typeof timestampInSeconds !== 'number') {
-      return SafetyNumberMode.DefaultE164AndThenACI;
-    }
-
-    // Note: serverTimeSkew is a difference between server time and local time,
-    // so we have to add local time to it to correct it for a skew.
-    return now + serverTimeSkew >= timestampInSeconds * SECOND
-      ? SafetyNumberMode.DefaultACIAndMaybeE164
-      : SafetyNumberMode.DefaultE164AndThenACI;
-  }
-);
-
 export const getDefaultConversationColor = createSelector(
   getItems,
   (

ts/state/smart/SafetyNumberModal.tsx

@@ -7,10 +7,7 @@ import { SafetyNumberModal } from '../../components/SafetyNumberModal';
 import type { StateType } from '../reducer';
 import { getContactSafetyNumber } from '../selectors/safetyNumber';
 import { getConversationSelector } from '../selectors/conversations';
-import {
-  getSafetyNumberMode,
-  getHasCompletedSafetyNumberOnboarding,
-} from '../selectors/items';
+import { getHasCompletedSafetyNumberOnboarding } from '../selectors/items';
 import { getIntl } from '../selectors/user';
 
 export type Props = {
@@ -22,7 +19,6 @@ const mapStateToProps = (state: StateType, props: Props) => {
     ...props,
     ...getContactSafetyNumber(state, props),
     contact: getConversationSelector(state)(props.contactID),
-    safetyNumberMode: getSafetyNumberMode(state, { now: Date.now() }),
     hasCompletedSafetyNumberOnboarding:
       getHasCompletedSafetyNumberOnboarding(state),
     i18n: getIntl(state),

ts/state/smart/SafetyNumberViewer.tsx

@@ -8,7 +8,6 @@ import type { StateType } from '../reducer';
 import type { SafetyNumberProps } from '../../components/SafetyNumberChangeDialog';
 import { getContactSafetyNumber } from '../selectors/safetyNumber';
 import { getConversationSelector } from '../selectors/conversations';
-import { getSafetyNumberMode } from '../selectors/items';
 import { getIntl } from '../selectors/user';
 
 const mapStateToProps = (state: StateType, props: SafetyNumberProps) => {
@@ -16,7 +15,6 @@ const mapStateToProps = (state: StateType, props: SafetyNumberProps) => {
     ...props,
     ...getContactSafetyNumber(state, props),
     contact: getConversationSelector(state)(props.contactID),
-    safetyNumberMode: getSafetyNumberMode(state, { now: Date.now() }),
     i18n: getIntl(state),
   };
 };