Remove safetyNumberAci remote configuration

ts/components/SafetyNumberModal.tsx

@@ -3,7 +3,6 @@
 
 import React, { useState, useCallback } from 'react';
 
-import { SafetyNumberMode } from '../types/safetyNumber';
 import { isSafetyNumberNotAvailable } from '../util/isSafetyNumberNotAvailable';
 import { Modal } from './Modal';
 import type { PropsType as SafetyNumberViewerPropsType } from './SafetyNumberViewer';
@@ -24,11 +23,10 @@ export function SafetyNumberModal({
   markHasCompletedSafetyNumberOnboarding,
   ...safetyNumberViewerProps
 }: PropsType): JSX.Element | null {
-  const { contact, safetyNumberMode } = safetyNumberViewerProps;
+  const { contact } = safetyNumberViewerProps;
 
   const [isOnboarding, setIsOnboarding] = useState(
-    safetyNumberMode !== SafetyNumberMode.JustE164 &&
-      !hasCompletedSafetyNumberOnboarding
+    !hasCompletedSafetyNumberOnboarding
   );
 
   const showOnboarding = useCallback(() => {
@@ -40,14 +38,10 @@ export function SafetyNumberModal({
     markHasCompletedSafetyNumberOnboarding();
   }, [setIsOnboarding, markHasCompletedSafetyNumberOnboarding]);
 
-  const missingRequiredE164 =
-    safetyNumberMode !== SafetyNumberMode.DefaultACIAndMaybeE164 &&
-    !contact.e164;
-
   let title: string | undefined;
   let content: JSX.Element;
   let hasXButton = true;
-  if (missingRequiredE164 || isSafetyNumberNotAvailable(contact)) {
+  if (isSafetyNumberNotAvailable(contact)) {
     content = (
       <SafetyNumberNotReady
         i18n={i18n}

ts/components/SafetyNumberViewer.stories.tsx

@@ -7,10 +7,7 @@ import type { Meta } from '@storybook/react';
 import type { PropsType } from './SafetyNumberViewer';
 import { SafetyNumberViewer } from './SafetyNumberViewer';
 import { setupI18n } from '../util/setupI18n';
-import {
-  SafetyNumberIdentifierType,
-  SafetyNumberMode,
-} from '../types/safetyNumber';
+import { SafetyNumberIdentifierType } from '../types/safetyNumber';
 import enMessages from '../../_locales/en/messages.json';
 import { getDefaultConversation } from '../test-both/helpers/getDefaultConversation';
 
@@ -72,8 +69,6 @@ const createProps = (overrideProps: Partial<PropsType> = {}): PropsType => ({
   contact: overrideProps.contact || contactWithAllData,
   generateSafetyNumber: action('generate-safety-number'),
   i18n,
-  safetyNumberMode:
-    overrideProps.safetyNumberMode ?? SafetyNumberMode.DefaultE164AndThenACI,
   safetyNumbers: overrideProps.safetyNumbers ?? [
     {
       identifierType: SafetyNumberIdentifierType.ACIIdentifier,
@@ -97,28 +92,10 @@ export function SafetyNumber(): JSX.Element {
   return <SafetyNumberViewer {...createProps({})} />;
 }
 
-export function SafetyNumberBeforeE164Transition(): JSX.Element {
-  return (
-    <SafetyNumberViewer
-      {...createProps({
-        safetyNumberMode: SafetyNumberMode.JustE164,
-        safetyNumbers: [
-          {
-            identifierType: SafetyNumberIdentifierType.E164Identifier,
-            numberBlocks: generateNumberBlocks(),
-            qrData: generateQRData(),
-          },
-        ],
-      })}
-    />
-  );
-}
-
 export function SafetyNumberE164Transition(): JSX.Element {
   return (
     <SafetyNumberViewer
       {...createProps({
-        safetyNumberMode: SafetyNumberMode.DefaultE164AndThenACI,
         safetyNumbers: [
           {
             identifierType: SafetyNumberIdentifierType.E164Identifier,

ts/components/SafetyNumberViewer.tsx

@@ -12,10 +12,7 @@ import { Emojify } from './conversation/Emojify';
 import type { LocalizerType } from '../types/Util';
 import type { SafetyNumberType } from '../types/safetyNumber';
 import { SAFETY_NUMBER_MIGRATION_URL } from '../types/support';
-import {
-  SafetyNumberIdentifierType,
-  SafetyNumberMode,
-} from '../types/safetyNumber';
+import { SafetyNumberIdentifierType } from '../types/safetyNumber';
 import { arrow } from '../util/keyboard';
 
 export type PropsType = {
@@ -23,7 +20,6 @@ export type PropsType = {
   generateSafetyNumber: (contact: ConversationType) => void;
   i18n: LocalizerType;
   onClose: () => void;
-  safetyNumberMode: SafetyNumberMode;
   safetyNumbers?: ReadonlyArray<SafetyNumberType>;
   toggleVerified: (contact: ConversationType) => void;
   showOnboarding?: () => void;
@@ -35,7 +31,6 @@ export function SafetyNumberViewer({
   generateSafetyNumber,
   i18n,
   onClose,
-  safetyNumberMode,
   safetyNumbers,
   toggleVerified,
   showOnboarding,
@@ -115,8 +110,6 @@ export function SafetyNumberViewer({
     ? i18n('icu:SafetyNumberViewer__clearVerification')
     : i18n('icu:SafetyNumberViewer__markAsVerified');
 
-  const isMigrationVisible = safetyNumberMode !== SafetyNumberMode.JustE164;
-
   const visibleSafetyNumber = safetyNumbers.at(selectedIndex);
   if (!visibleSafetyNumber) {
     return null;
@@ -188,54 +181,44 @@ export function SafetyNumberViewer({
 
   return (
     <div className="module-SafetyNumberViewer">
-      {isMigrationVisible && (
-        <div className="module-SafetyNumberViewer__migration">
-          <div className="module-SafetyNumberViewer__migration__icon" />
+      <div className="module-SafetyNumberViewer__migration">
+        <div className="module-SafetyNumberViewer__migration__icon" />
 
-          <div className="module-SafetyNumberViewer__migration__text">
-            <p>
-              <Intl i18n={i18n} id="icu:SafetyNumberViewer__migration__text" />
-            </p>
-            <p>
-              <a
-                href={SAFETY_NUMBER_MIGRATION_URL}
-                rel="noreferrer"
-                target="_blank"
-                onClick={e => {
-                  if (showOnboarding) {
-                    e.preventDefault();
-                    showOnboarding();
-                  }
-                }}
-              >
-                <Intl
-                  i18n={i18n}
-                  id="icu:SafetyNumberViewer__migration__learn_more"
-                />
-              </a>
-            </p>
-          </div>
+        <div className="module-SafetyNumberViewer__migration__text">
+          <p>
+            <Intl i18n={i18n} id="icu:SafetyNumberViewer__migration__text" />
+          </p>
+          <p>
+            <a
+              href={SAFETY_NUMBER_MIGRATION_URL}
+              rel="noreferrer"
+              target="_blank"
+              onClick={e => {
+                if (showOnboarding) {
+                  e.preventDefault();
+                  showOnboarding();
+                }
+              }}
+            >
+              <Intl
+                i18n={i18n}
+                id="icu:SafetyNumberViewer__migration__learn_more"
+              />
+            </a>
+          </p>
         </div>
-      )}
+      </div>
 
       {safetyNumberCard}
 
       {safetyNumbers.length > 1 && carousel}
 
       <div className="module-SafetyNumberViewer__help">
-        {isMigrationVisible ? (
-          <Intl
-            i18n={i18n}
-            id="icu:SafetyNumberViewer__hint--migration"
-            components={{ name: boldName }}
-          />
-        ) : (
-          <Intl
-            i18n={i18n}
-            id="icu:SafetyNumberViewer__hint--normal"
-            components={{ name: boldName }}
-          />
-        )}
+        <Intl
+          i18n={i18n}
+          id="icu:SafetyNumberViewer__hint--migration"
+          components={{ name: boldName }}
+        />
         <br />
         <a href={SAFETY_NUMBER_MIGRATION_URL} rel="noreferrer" target="_blank">
           <Intl