From 254cddc5146d35505eb70c2249170f675e8df541 Mon Sep 17 00:00:00 2001 From: Scott Nonnenberg Date: Wed, 24 Feb 2021 11:07:05 -0800 Subject: [PATCH] Move getPlaceholder to component that needs it --- ts/components/SafetyNumberViewer.tsx | 7 ++++++- ts/util/index.ts | 6 +----- ts/util/safetyNumber.ts | 6 ------ 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/ts/components/SafetyNumberViewer.tsx b/ts/components/SafetyNumberViewer.tsx index 3945112dbd..7c804f2fb3 100644 --- a/ts/components/SafetyNumberViewer.tsx +++ b/ts/components/SafetyNumberViewer.tsx @@ -4,7 +4,6 @@ import React from 'react'; import { ConversationType } from '../state/ducks/conversations'; import { LocalizerType } from '../types/Util'; -import { getPlaceholder } from '../util/safetyNumber'; import { Intl } from './Intl'; export type PropsType = { @@ -112,3 +111,9 @@ export const SafetyNumberViewer = ({ ); }; + +function getPlaceholder(): string { + return Array.from(Array(12)) + .map(() => 'XXXXX') + .join(' '); +} diff --git a/ts/util/index.ts b/ts/util/index.ts index b8c53db379..eab75b1aee 100644 --- a/ts/util/index.ts +++ b/ts/util/index.ts @@ -9,10 +9,7 @@ import { createBatcher } from './batcher'; import { createWaitBatcher } from './waitBatcher'; import { deleteForEveryone } from './deleteForEveryone'; import { downloadAttachment } from './downloadAttachment'; -import { - generateSecurityNumber, - getPlaceholder as getSafetyNumberPlaceholder, -} from './safetyNumber'; +import { generateSecurityNumber } from './safetyNumber'; import { getStringForProfileChange } from './getStringForProfileChange'; import { getTextWithMentions } from './getTextWithMentions'; import { getUserAgent } from './getUserAgent'; @@ -36,7 +33,6 @@ export { downloadAttachment, fromWebSafeBase64, generateSecurityNumber, - getSafetyNumberPlaceholder, getStringForProfileChange, getTextWithMentions, getUserAgent, diff --git a/ts/util/safetyNumber.ts b/ts/util/safetyNumber.ts index 8356d9f059..15985d98a1 100644 --- a/ts/util/safetyNumber.ts +++ b/ts/util/safetyNumber.ts @@ -28,12 +28,6 @@ export async function generateSecurityNumber( return Promise.resolve(fingerprintString); } -export function getPlaceholder(): string { - return Array.from(Array(12)) - .map(() => 'XXXXX') - .join(' '); -} - export async function generateSecurityNumberBlock( contact: ConversationType ): Promise> {