diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 4fcc5c96e..3819b4a55 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -8,7 +8,6 @@ "addingContacts": "Adding contacts to $name$", "addModerator": "Add Admin", "addModerators": "Add Admins", - "allUsersAreRandomly...": "Your Session ID is the unique address people can use to contact you on Session. With no connection to your real identity, your Session ID is totally anonymous and private by design.", "anonymous": "Anonymous", "answeredACall": "Call with $name$", "appearanceSettingsTitle": "Appearance", @@ -107,7 +106,7 @@ "copyErrorAndQuit": "Copy error and quit", "copyMessage": "Copy message text", "copyOpenGroupURL": "Copy Group URL", - "copySessionID": "Copy Session ID", + "accountIDCopy": "Copy Account ID", "couldntFindServerMatching": "Couldn't find the corresponding Community server", "create": "Create", "createClosedGroupNamePrompt": "Group Name", @@ -116,7 +115,6 @@ "createConversationNewGroup": "Create a group with existing contacts", "createGroup": "Create Group", "createPassword": "Create your password", - "createSessionID": "Create Session ID", "databaseError": "Database Error", "debugLog": "Debug Log", "debugLogExplanation": "This log will be saved to your desktop.", @@ -195,9 +193,8 @@ "enterPassword": "Please enter your password", "enterRecoveryPhrase": "Enter your recovery phrase", "enterSendNewMessageDescription": "ENTER sends a message, SHIFT + ENTER starts a new line", - "enterSessionID": "Enter Session ID", - "enterSessionIDOfRecipient": "Enter your contact's Session ID or ONS", - "enterSessionIDOrONSName": "Enter Session ID or ONS name", + "accountIdEnter": "Enter Account ID", + "accountIdEnterYourFriends": "Enter your friend's Account ID or ONS", "entireAccount": "Clear Device and Network", "error": "Error", "establishingConnection": "Establishing connection...", @@ -241,12 +238,12 @@ "incomingError": "Error handling incoming message", "invalidGroupNameTooLong": "Please enter a shorter group name", "invalidGroupNameTooShort": "Please enter a group name", - "invalidNumberError": "Please check the Session ID or ONS name and try again", + "onsErrorNotRecognised": "We couldn't recognise this ONS. Please check it and try again.", "invalidOldPassword": "Old password is invalid", "invalidOpenGroupUrl": "Invalid URL", "invalidPassword": "Invalid password", "invalidPubkeyFormat": "Invalid Pubkey Format", - "invalidSessionId": "Invalid Session ID", + "invalidAccountId": "Invalid Account ID", "inviteContacts": "Invite Contacts", "join": "Join", "joinACommunity": "Join a community", @@ -425,7 +422,7 @@ "recoveryPasswordErrorMessageShort": "The Recovery Password you entered is not long enough. Please check and try again.", "recoveryPhrase": "Recovery Phrase", "recoveryPhraseEmpty": "Enter your recovery phrase", - "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Session ID — you can use it to restore your Session ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.", + "recoveryPhraseSavePromptMain": "Your recovery phrase is the master key to your Account ID — you can use it to restore your Account ID if you lose access to your device. Store your recovery phrase in a safe place, and don't give it to anyone.", "remove": "Remove", "removeAccountPasswordDescription": "Remove the password required to unlock Session.", "removeAccountPasswordTitle": "Remove Password", @@ -443,7 +440,7 @@ "requestsSubtitle": "Pending Requests", "resend": "Resend", "resolution": "Resolution", - "respondingToRequestWarning": "Sending a message to this user will automatically accept their message request and reveal your Session ID.", + "messageRequestsAcceptDescription": "Sending a message to this user will automatically accept their message request and reveal your Account ID.", "restoreUsingRecoveryPhrase": "Restore your account", "ringing": "Ringing...", "save": "Save", @@ -494,7 +491,7 @@ "startedACall": "You called $name$", "startInTrayDescription": "Keep Session running in the background when you close the window.", "startInTrayTitle": "Keep in System Tray", - "startNewConversationBy...": "Start a new conversation by entering someone's Session ID or share your Session ID with them.", + "messageNewDescription": "Start a new conversation by entering someone's Account ID or scanning their QR code.", "support": "Support", "surveyTitle": "We'd Love Your Feedback", "termsOfService": "Terms of Service", @@ -594,8 +591,7 @@ "youGotKickedFromGroup": "You were removed from the group.", "youHaveANewFriendRequest": "You have a new friend request", "youLeftTheGroup": "You have left the group.", - "yourSessionID": "Your Session ID", - "yourUniqueSessionID": "Say hello to your Session ID", + "accountIdYours": "Your Account ID", "youSetYourDisappearingMessages": "You set your messages to disappear $time$ after they have been $type$.", "zoomFactorSettingTitle": "Zoom Factor" } diff --git a/ts/components/basic/YourSessionIDPill.tsx b/ts/components/basic/YourSessionIDPill.tsx index 6ff6a325a..d1ce7e483 100644 --- a/ts/components/basic/YourSessionIDPill.tsx +++ b/ts/components/basic/YourSessionIDPill.tsx @@ -27,7 +27,7 @@ export const YourSessionIDPill = () => { return ( - {window.i18n('yourSessionID')} + {window.i18n('accountIdYours')} ); diff --git a/ts/components/conversation/SubtleNotification.tsx b/ts/components/conversation/SubtleNotification.tsx index 78260a6f8..336fe03e2 100644 --- a/ts/components/conversation/SubtleNotification.tsx +++ b/ts/components/conversation/SubtleNotification.tsx @@ -46,7 +46,7 @@ export const ConversationRequestExplanation = () => { return ( - {window.i18n('respondingToRequestWarning')} + {window.i18n('messageRequestsAcceptDescription')} ); }; diff --git a/ts/components/conversation/message/message-content/MessageAvatar.tsx b/ts/components/conversation/message/message-content/MessageAvatar.tsx index 5c1a9faa3..d8abf70d7 100644 --- a/ts/components/conversation/message/message-content/MessageAvatar.tsx +++ b/ts/components/conversation/message/message-content/MessageAvatar.tsx @@ -62,7 +62,7 @@ export const MessageAvatar = (props: Props) => { return; } if (isPublic && !PubKey.isBlinded(sender)) { - // public chat but session id not blinded. disable showing user details if we do not have an active convo with that user. + // public chat but account id not blinded. disable showing user details if we do not have an active convo with that user. // an unactive convo with that user means that we never chatted with that id directyly, but only through a sogs const convoWithSender = getConversationController().get(sender); if (!convoWithSender || !convoWithSender.get('active_at')) { diff --git a/ts/components/dialog/BanOrUnbanUserDialog.tsx b/ts/components/dialog/BanOrUnbanUserDialog.tsx index 6d9ada429..7f55b9ca9 100644 --- a/ts/components/dialog/BanOrUnbanUserDialog.tsx +++ b/ts/components/dialog/BanOrUnbanUserDialog.tsx @@ -134,7 +134,7 @@ export const BanOrUnBanUserDialog = (props: { ref={inputRef} type="text" darkMode={darkMode} - placeholder={i18n('enterSessionID')} + placeholder={i18n('accountIdEnter')} dir="auto" onChange={onPubkeyBoxChanges} disabled={inProgress || wasGivenAPubkey} diff --git a/ts/components/dialog/ModeratorsAddDialog.tsx b/ts/components/dialog/ModeratorsAddDialog.tsx index 58e906f44..ef1e95996 100644 --- a/ts/components/dialog/ModeratorsAddDialog.tsx +++ b/ts/components/dialog/ModeratorsAddDialog.tsx @@ -86,7 +86,7 @@ export const AddModeratorsDialog = (props: Props) => { { await switchThemeTo(themeConfig); }; -// Do this only if we created a new Session ID, or if we already received the initial configuration message +// Do this only if we created a new account id, or if we already received the initial configuration message const triggerSyncIfNeeded = async () => { const us = UserUtils.getOurPubKeyStrFromCache(); await getConversationController().get(us).setDidApproveMe(true, true); diff --git a/ts/components/leftpane/overlay/OverlayMessage.tsx b/ts/components/leftpane/overlay/OverlayMessage.tsx index b8ba7123b..9f429fc17 100644 --- a/ts/components/leftpane/overlay/OverlayMessage.tsx +++ b/ts/components/leftpane/overlay/OverlayMessage.tsx @@ -51,8 +51,8 @@ export const OverlayMessage = () => { const title = window.i18n('newMessage'); const buttonText = window.i18n('next'); - const subtitle = window.i18n('enterSessionID'); - const placeholder = window.i18n('enterSessionIDOrONSName'); + const subtitle = window.i18n('accountIdEnter'); + const placeholder = window.i18n('accountIdEnterYourFriends'); const disableNextButton = !pubkeyOrOns || loading; @@ -80,7 +80,7 @@ export const OverlayMessage = () => { async function handleMessageButtonClick() { if ((!pubkeyOrOns && !pubkeyOrOns.length) || !pubkeyOrOns.trim().length) { - ToastUtils.pushToastError('invalidPubKey', window.i18n('invalidNumberError')); // or ons name + ToastUtils.pushToastError('invalidPubKey', window.i18n('onsErrorNotRecognised')); // or ons name return; } const pubkeyorOnsTrimmed = pubkeyOrOns.trim(); @@ -93,7 +93,7 @@ export const OverlayMessage = () => { // this might be an ONS, validate the regex first const mightBeOnsName = new RegExp(ONSResolve.onsNameRegex, 'g').test(pubkeyorOnsTrimmed); if (!mightBeOnsName) { - ToastUtils.pushToastError('invalidPubKey', window.i18n('invalidNumberError')); + ToastUtils.pushToastError('invalidPubKey', window.i18n('onsErrorNotRecognised')); return; } setLoading(true); @@ -126,7 +126,7 @@ export const OverlayMessage = () => { - {window.i18n('startNewConversationBy...')} + {window.i18n('messageNewDescription')} diff --git a/ts/components/menu/Menu.tsx b/ts/components/menu/Menu.tsx index b70a253bd..7cc0a7c89 100644 --- a/ts/components/menu/Menu.tsx +++ b/ts/components/menu/Menu.tsx @@ -301,7 +301,7 @@ export const CopyMenuItem = (): JSX.Element | null => { // we want to show the copyId for open groups and private chats only if ((isPrivate && !isBlinded) || isPublic) { - const copyIdLabel = isPublic ? window.i18n('copyOpenGroupURL') : window.i18n('copySessionID'); + const copyIdLabel = isPublic ? window.i18n('copyOpenGroupURL') : window.i18n('accountIDCopy'); return ( { diff --git a/ts/mains/main_renderer.tsx b/ts/mains/main_renderer.tsx index b9c80b0d2..2b427d6a8 100644 --- a/ts/mains/main_renderer.tsx +++ b/ts/mains/main_renderer.tsx @@ -590,7 +590,7 @@ class TextScramble { } window.Session = window.Session || {}; -// TODO[ses-50] remove this since we no longer show the session id in onboarding +// TODO[ses-50] remove this since we no longer show the account id in onboarding window.Session.setNewSessionID = (sessionID: string) => { const el = document.querySelector('.session-id-editable-textarea'); const fx = new TextScramble(el); diff --git a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts index e569eb40b..491adb440 100644 --- a/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts +++ b/ts/session/apis/open_group_api/sogsv3/knownBlindedkeys.ts @@ -1,20 +1,20 @@ -import { from_hex, to_hex } from 'libsodium-wrappers-sumo'; import { crypto_sign_curve25519_pk_to_ed25519 } from 'curve25519-js'; +import { from_hex, to_hex } from 'libsodium-wrappers-sumo'; import { cloneDeep, flatten, isEmpty, isEqual, isString, uniqBy } from 'lodash'; -import { getConversationController } from '../../../conversations'; -import { LibSodiumWrappers } from '../../../crypto'; -import { KeyPrefixType, PubKey } from '../../../types'; import { Data } from '../../../../data/data'; -import { combineKeys, generateBlindingFactor } from '../../../utils/SodiumUtils'; import { OpenGroupData } from '../../../../data/opengroups'; -import { ConversationModel } from '../../../../models/conversation'; -import { UserUtils } from '../../../utils'; -import { SogsBlinding } from './sogsBlinding'; -import { fromHexToArray } from '../../../utils/String'; import { KNOWN_BLINDED_KEYS_ITEM } from '../../../../data/settings-key'; +import { ConversationModel } from '../../../../models/conversation'; import { roomHasBlindEnabled } from '../../../../types/sqlSharedTypes'; import { Storage } from '../../../../util/storage'; +import { getConversationController } from '../../../conversations'; +import { LibSodiumWrappers } from '../../../crypto'; +import { KeyPrefixType, PubKey } from '../../../types'; +import { UserUtils } from '../../../utils'; +import { combineKeys, generateBlindingFactor } from '../../../utils/SodiumUtils'; +import { fromHexToArray } from '../../../utils/String'; +import { SogsBlinding } from './sogsBlinding'; export type BlindedIdMapping = { blindedId: string; @@ -157,7 +157,7 @@ export function tryMatchBlindWithStandardKey( const blindedIdNoPrefix = PubKey.removePrefixIfNeeded(PubKey.cast(blindedSessionId).key); const kBytes = generateBlindingFactor(serverPubKey, sodium); - // From the session id (ignoring 05 prefix) we have two possible ed25519 pubkeys; the first is + // From the account id (ignoring 05 prefix) we have two possible ed25519 pubkeys; the first is // the positive(which is what Signal's XEd25519 conversion always uses) const inbin = from_hex(sessionIdNoPrefix); diff --git a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts index 9a2edf381..ff7eeebf8 100644 --- a/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts +++ b/ts/session/apis/open_group_api/sogsv3/sogsApiV3.ts @@ -267,7 +267,7 @@ const handleMessagesResponseV4 = async ( ); const roomDetails: OpenGroupRequestCommonType = pick(roomInfos, 'serverUrl', 'roomId'); - // then we try to find matching real session ids with the blinded ids we have. + // then we try to find matching real account ids with the blinded ids we have. // this is where we override the blindedId with the real one in case we already know that user real sessionId const messagesWithResolvedBlindedIdsIfFound = []; diff --git a/ts/session/apis/snode_api/onsResolve.ts b/ts/session/apis/snode_api/onsResolve.ts index a0a27d0a1..c7555266e 100644 --- a/ts/session/apis/snode_api/onsResolve.ts +++ b/ts/session/apis/snode_api/onsResolve.ts @@ -103,7 +103,7 @@ async function getSessionIDForOnsName(onsNameCase: string) { throw new Error('ONSresolve: Validation failed'); } - // assert all the returned session ids are the same + // assert all the returned account ids are the same if (_.uniq(allResolvedSessionIds).length !== 1) { throw new Error('ONSresolve: Validation failed'); } diff --git a/ts/session/types/PubKey.ts b/ts/session/types/PubKey.ts index 2320bf646..a1f49d10c 100644 --- a/ts/session/types/PubKey.ts +++ b/ts/session/types/PubKey.ts @@ -134,7 +134,7 @@ export class PubKey { // Check if it's hex const isHex = pubkey.replace(/[\s]*/g, '').match(/^[0-9a-fA-F]+$/); if (!isHex) { - return window.i18n('invalidSessionId'); + return window.i18n('invalidAccountId'); } // Check if the pubkey length is 33 and leading with 05 or of length 32 diff --git a/ts/types/LocalizerKeys.ts b/ts/types/LocalizerKeys.ts index 3f4a56650..6ebcdffd7 100644 --- a/ts/types/LocalizerKeys.ts +++ b/ts/types/LocalizerKeys.ts @@ -1,6 +1,10 @@ export type LocalizerKeys = | 'about' | 'accept' + | 'accountIDCopy' + | 'accountIdEnter' + | 'accountIdEnterYourFriends' + | 'accountIdYours' | 'activeMembers' | 'add' | 'addACaption' @@ -8,7 +12,6 @@ export type LocalizerKeys = | 'addModerator' | 'addModerators' | 'addingContacts' - | 'allUsersAreRandomly...' | 'anonymous' | 'answeredACall' | 'appMenuHide' @@ -107,7 +110,6 @@ export type LocalizerKeys = | 'copyErrorAndQuit' | 'copyMessage' | 'copyOpenGroupURL' - | 'copySessionID' | 'couldntFindServerMatching' | 'create' | 'createClosedGroupNamePrompt' @@ -116,7 +118,6 @@ export type LocalizerKeys = | 'createConversationNewGroup' | 'createGroup' | 'createPassword' - | 'createSessionID' | 'databaseError' | 'debugLog' | 'debugLogExplanation' @@ -195,9 +196,6 @@ export type LocalizerKeys = | 'enterPassword' | 'enterRecoveryPhrase' | 'enterSendNewMessageDescription' - | 'enterSessionID' - | 'enterSessionIDOfRecipient' - | 'enterSessionIDOrONSName' | 'entireAccount' | 'error' | 'establishingConnection' @@ -239,14 +237,13 @@ export type LocalizerKeys = | 'imageCaptionIconAlt' | 'incomingCallFrom' | 'incomingError' + | 'invalidAccountId' | 'invalidGroupNameTooLong' | 'invalidGroupNameTooShort' - | 'invalidNumberError' | 'invalidOldPassword' | 'invalidOpenGroupUrl' | 'invalidPassword' | 'invalidPubkeyFormat' - | 'invalidSessionId' | 'inviteContacts' | 'join' | 'joinACommunity' @@ -305,11 +302,13 @@ export type LocalizerKeys = | 'messageDeletionForbidden' | 'messageHash' | 'messageInfo' + | 'messageNewDescription' | 'messageRequestAccepted' | 'messageRequestAcceptedOurs' | 'messageRequestAcceptedOursNoName' | 'messageRequestPending' | 'messageRequests' + | 'messageRequestsAcceptDescription' | 'messageWillDisappear' | 'messagesHeader' | 'moreInformation' @@ -371,6 +370,7 @@ export type LocalizerKeys = | 'onlyAdminCanRemoveMembers' | 'onlyAdminCanRemoveMembersDesc' | 'onlyGroupAdminsCanChange' + | 'onsErrorNotRecognised' | 'open' | 'openGroupInvitation' | 'openGroupURL' @@ -443,7 +443,6 @@ export type LocalizerKeys = | 'requestsSubtitle' | 'resend' | 'resolution' - | 'respondingToRequestWarning' | 'restoreUsingRecoveryPhrase' | 'ringing' | 'save' @@ -493,7 +492,6 @@ export type LocalizerKeys = | 'startConversation' | 'startInTrayDescription' | 'startInTrayTitle' - | 'startNewConversationBy...' | 'startedACall' | 'support' | 'surveyTitle' @@ -595,6 +593,5 @@ export type LocalizerKeys = | 'youHaveANewFriendRequest' | 'youLeftTheGroup' | 'youSetYourDisappearingMessages' - | 'yourSessionID' | 'yourUniqueSessionID' | 'zoomFactorSettingTitle';