diff --git a/_locales/en/messages.json b/_locales/en/messages.json index d20917fd61..f06dcccada 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -953,7 +953,7 @@ }, "icu:noSearchResults--sms-only": { "messageformat": "SMS/MMS contacts are not available on Desktop.", - "description": "Shown in the search left pane when no results were found and primary device has SMS/MMS handling enabled" + "description": "(Deleted 2025/02/06) Shown in the search left pane when no results were found and primary device has SMS/MMS handling enabled" }, "icu:noSearchResultsInConversation": { "messageformat": "No results for \"{searchTerm}\" in {conversationName}", diff --git a/protos/SignalStorage.proto b/protos/SignalStorage.proto index f6dc4029f3..b407fe1c37 100644 --- a/protos/SignalStorage.proto +++ b/protos/SignalStorage.proto @@ -203,7 +203,7 @@ message AccountRecord { repeated PinnedConversation pinnedConversations = 14; optional bool preferContactAvatars = 15; optional uint32 universalExpireTimer = 17; - optional bool primarySendsSms = 18; + reserved 18; // primarySendsSms reserved 19; // deprecatedE164 repeated string preferredReactionEmoji = 20; optional bytes subscriberId = 21; diff --git a/ts/background.ts b/ts/background.ts index 0190a0ff20..df78ef14f0 100644 --- a/ts/background.ts +++ b/ts/background.ts @@ -970,6 +970,10 @@ export async function startApp(): Promise { if (window.isBeforeVersion(lastVersion, 'v7.33.0-beta.1')) { await window.storage.remove('masterKeyLastRequestTime'); } + + if (window.isBeforeVersion(lastVersion, 'v7.43.0-beta.1')) { + await window.storage.remove('primarySendsSms'); + } } setAppLoadingScreenMessage( diff --git a/ts/components/LeftPane.stories.tsx b/ts/components/LeftPane.stories.tsx index f91ff4f8e1..d82cd0b6c5 100644 --- a/ts/components/LeftPane.stories.tsx +++ b/ts/components/LeftPane.stories.tsx @@ -561,24 +561,6 @@ export function SearchNoResultsWhenSearchingEverywhere(): JSX.Element { conversationResults: emptySearchResultsGroup, contactResults: emptySearchResultsGroup, messageResults: emptySearchResultsGroup, - primarySendsSms: false, - }, - })} - /> - ); -} - -export function SearchNoResultsWhenSearchingEverywhereSms(): JSX.Element { - return ( - @@ -596,7 +578,6 @@ export function SearchNoResultsWhenSearchingInAConversation(): JSX.Element { contactResults: emptySearchResultsGroup, messageResults: emptySearchResultsGroup, searchConversationName: 'Bing Bong', - primarySendsSms: false, }, })} /> @@ -614,7 +595,6 @@ export function SearchNoResultsUnreadFilterAndQuery(): JSX.Element { conversationResults: emptySearchResultsGroup, contactResults: emptySearchResultsGroup, messageResults: emptySearchResultsGroup, - primarySendsSms: false, }, })} /> @@ -633,7 +613,6 @@ export function SearchNoResultsUnreadFilterWithoutQuery(): JSX.Element { conversationResults: emptySearchResultsGroup, contactResults: emptySearchResultsGroup, messageResults: emptySearchResultsGroup, - primarySendsSms: false, }, })} /> @@ -650,7 +629,6 @@ export function SearchAllResultsLoading(): JSX.Element { conversationResults: { isLoading: true }, contactResults: { isLoading: true }, messageResults: { isLoading: true }, - primarySendsSms: false, }, })} /> @@ -670,7 +648,6 @@ export function SearchSomeResultsLoading(): JSX.Element { }, contactResults: { isLoading: true }, messageResults: { isLoading: true }, - primarySendsSms: false, }, })} /> @@ -690,7 +667,6 @@ export function SearchHasConversationsAndContactsButNotMessages(): JSX.Element { }, contactResults: { isLoading: false, results: defaultConversations }, messageResults: { isLoading: false, results: [] }, - primarySendsSms: false, }, })} /> @@ -716,7 +692,6 @@ export function SearchAllResults(): JSX.Element { { id: 'msg2', type: 'incoming', conversationId: 'bar' }, ], }, - primarySendsSms: false, }, })} /> @@ -740,7 +715,6 @@ export function SearchAllResultsUnreadFilter(): JSX.Element { isLoading: false, results: [], }, - primarySendsSms: false, }, })} /> diff --git a/ts/components/leftPane/LeftPaneSearchHelper.tsx b/ts/components/leftPane/LeftPaneSearchHelper.tsx index 3e9b762861..00b209562e 100644 --- a/ts/components/leftPane/LeftPaneSearchHelper.tsx +++ b/ts/components/leftPane/LeftPaneSearchHelper.tsx @@ -41,7 +41,6 @@ export type LeftPaneSearchPropsType = { type: string; }>; searchConversationName?: string; - primarySendsSms: boolean; searchTerm: string; filterByUnread: boolean; startSearchCounter: number; @@ -62,7 +61,6 @@ export class LeftPaneSearchHelper extends LeftPaneHelper; readonly #searchConversationName?: string; - readonly #primarySendsSms: boolean; readonly #searchTerm: string; readonly #startSearchCounter: number; readonly #searchDisabled: boolean; @@ -74,7 +72,6 @@ export class LeftPaneSearchHelper extends LeftPaneHelper )}
{noResultsMessage}
- {primarySendsSms && ( -
- {i18n('icu:noSearchResults--sms-only')} -
- )} ); } diff --git a/ts/services/storageRecordOps.ts b/ts/services/storageRecordOps.ts index d88b7097a0..6cb9f15d86 100644 --- a/ts/services/storageRecordOps.ts +++ b/ts/services/storageRecordOps.ts @@ -308,11 +308,6 @@ export function toAccountRecord( accountRecord.preferContactAvatars = Boolean(preferContactAvatars); } - const primarySendsSms = window.storage.get('primarySendsSms'); - if (primarySendsSms !== undefined) { - accountRecord.primarySendsSms = Boolean(primarySendsSms); - } - const rawPreferredReactionEmoji = window.storage.get( 'preferredReactionEmoji' ); @@ -1333,7 +1328,6 @@ export async function mergeAccountRecord( sealedSenderIndicators, typingIndicators, preferContactAvatars, - primarySendsSms, universalExpireTimer, preferredReactionEmoji: rawPreferredReactionEmoji, subscriberId, @@ -1377,10 +1371,6 @@ export async function mergeAccountRecord( } } - if (typeof primarySendsSms === 'boolean') { - await window.storage.put('primarySendsSms', primarySendsSms); - } - if (preferredReactionEmoji.canBeSynced(rawPreferredReactionEmoji)) { const localPreferredReactionEmoji = window.storage.get('preferredReactionEmoji') || []; diff --git a/ts/state/smart/LeftPane.tsx b/ts/state/smart/LeftPane.tsx index 0dc9374db5..a3a5efa5d9 100644 --- a/ts/state/smart/LeftPane.tsx +++ b/ts/state/smart/LeftPane.tsx @@ -1,7 +1,6 @@ // Copyright 2019 Signal Messenger, LLC // SPDX-License-Identifier: AGPL-3.0-only -import { get } from 'lodash'; import React, { memo } from 'react'; import { useSelector } from 'react-redux'; import type { PropsType as DialogExpiredBuildPropsType } from '../../components/DialogExpiredBuild'; @@ -175,14 +174,9 @@ const getModeSpecificProps = ( }; } if (getIsActivelySearching(state)) { - const primarySendsSms = Boolean( - get(state.items, ['primarySendsSms'], false) - ); - return { mode: LeftPaneMode.Search, isSearchingGlobally: getIsSearchingGlobally(state), - primarySendsSms, searchConversation: getSearchConversation(state), searchDisabled: state.network.challengeStatus !== 'idle', startSearchCounter: getStartSearchCounter(state), diff --git a/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts index 91ffb38250..d7dbd5f29a 100644 --- a/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneArchiveHelper_test.ts @@ -29,7 +29,6 @@ describe('LeftPaneArchiveHelper', () => { contactResults: { isLoading: false, results: [] }, messageResults: { isLoading: false, results: [] }, searchTerm: 'foo', - primarySendsSms: false, }; beforeEach(() => { diff --git a/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts b/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts index 5c9f4dd34b..03976e6343 100644 --- a/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts +++ b/ts/test-node/components/leftPane/LeftPaneSearchHelper_test.ts @@ -16,7 +16,6 @@ const baseSearchHelperArgs = { messageResults: { isLoading: false, results: [] }, isSearchingGlobally: true, searchTerm: 'foo', - primarySendsSms: false, searchConversation: undefined, searchDisabled: false, startSearchCounter: 0, @@ -83,7 +82,6 @@ describe('LeftPaneSearchHelper', () => { messageResults: { isLoading: false, results: [] }, isSearchingGlobally: true, searchTerm: 'foo', - primarySendsSms: false, searchConversation: undefined, searchDisabled: false, startSearchCounter: 0, diff --git a/ts/types/Storage.d.ts b/ts/types/Storage.d.ts index f088bfa714..30fd7a3bf1 100644 --- a/ts/types/Storage.d.ts +++ b/ts/types/Storage.d.ts @@ -124,7 +124,6 @@ export type StorageAccessType = { phoneNumberDiscoverability: PhoneNumberDiscoverability; pinnedConversationIds: ReadonlyArray; preferContactAvatars: boolean; - primarySendsSms: boolean; textFormatting: boolean; typingIndicators: boolean; sealedSenderIndicators: boolean; @@ -226,6 +225,7 @@ export type StorageAccessType = { hasRegisterSupportForUnauthenticatedDelivery: never; masterKeyLastRequestTime: never; versionedExpirationTimer: never; + primarySendsSms: never; }; export type StorageInterface = {