From 66fa34b16537e1d17f0f25d64a511291b5ec52a0 Mon Sep 17 00:00:00 2001 From: yougotwill Date: Wed, 24 Jul 2024 16:17:21 +1000 Subject: [PATCH] feat: use testkey for user profile update in onboarding for testing a display name remove privateKeyBytesHex since we don't use it --- .../leftpane/overlay/SessionJoinableDefaultRooms.tsx | 5 +++++ ts/components/registration/stages/CreateAccount.tsx | 10 +--------- ts/session/profile_manager/ProfileManager.ts | 5 ++++- ts/state/onboarding/ducks/registration.ts | 6 ------ ts/state/onboarding/selectors/registration.ts | 9 --------- 5 files changed, 10 insertions(+), 25 deletions(-) diff --git a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx index cc9fc2eff..e1f45a5fc 100644 --- a/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx +++ b/ts/components/leftpane/overlay/SessionJoinableDefaultRooms.tsx @@ -153,6 +153,11 @@ export const SessionJoinableRooms = (props: { return null; } + // There is a spinner in the overlay, so we don't need to show it when joining + if (props.alreadyJoining) { + return null; + } + return ( { - const privateKeyBytesHex = useOnboardPrivateKeyBytesHex(); const recoveryPassword = useRecoveryPassword(); const displayName = useDisplayName(); const displayNameError = useDisplayNameError(); @@ -82,7 +79,6 @@ export const CreateAccount = () => { const newHexPubKey = StringUtils.decode(keyPair.pubKey, 'hex'); dispatch(setRecoveryPassword(mnemonic)); - dispatch(setPrivateKeyBytesHex(toHex(keyPair.ed25519KeyPair.privateKey))); dispatch(setHexGeneratedPubKey(newHexPubKey)); // our 'frontend' account ID } }; @@ -97,10 +93,6 @@ export const CreateAccount = () => { } try { - if (!privateKeyBytesHex) { - throw new Error('Private key not found'); - } - const validName = await ProfileManager.updateOurProfileDisplayName(displayName, true); await signUp({ diff --git a/ts/session/profile_manager/ProfileManager.ts b/ts/session/profile_manager/ProfileManager.ts index a92646916..9ab82cdde 100644 --- a/ts/session/profile_manager/ProfileManager.ts +++ b/ts/session/profile_manager/ProfileManager.ts @@ -6,6 +6,7 @@ import { getConversationController } from '../conversations'; import { SyncUtils, UserUtils } from '../utils'; import { fromHexToArray, sanitizeSessionUsername, toHex } from '../utils/String'; import { AvatarDownload } from '../utils/job_runners/jobs/AvatarDownloadJob'; +import { generateFakeECKeyPair } from '../../test/test-utils/utils'; export type Profile = { displayName: string | undefined; @@ -95,11 +96,13 @@ async function updateProfileOfContact( } } -export async function updateOurProfileDisplayName(newName: string, onboarding?: boolean) { +export async function updateOurProfileDisplayName(newName: string, onboarding?: true) { const cleanName = sanitizeSessionUsername(newName).trim(); if (onboarding) { try { + const tempKeyPair = generateFakeECKeyPair(); + await UserConfigWrapperActions.init(tempKeyPair.privateKeyData, null); const userInfoName = await UserConfigWrapperActions.setUserInfo( cleanName, CONVERSATION_PRIORITIES.default, diff --git a/ts/state/onboarding/ducks/registration.ts b/ts/state/onboarding/ducks/registration.ts index d6858d1a4..ef52f4bac 100644 --- a/ts/state/onboarding/ducks/registration.ts +++ b/ts/state/onboarding/ducks/registration.ts @@ -41,7 +41,6 @@ export type OnboardingState = { progress: number; recoveryPassword: string; recoveryPasswordError: string | undefined; - privateKeyBytesHex: string | undefined; hexGeneratedPubKey: string; displayName: string; displayNameError: string | undefined; @@ -55,7 +54,6 @@ const initialState: OnboardingState = { progress: 0, recoveryPassword: '', recoveryPasswordError: undefined, - privateKeyBytesHex: undefined, hexGeneratedPubKey: '', displayName: '', displayNameError: undefined, @@ -92,9 +90,6 @@ export const registrationSlice = createSlice({ setHexGeneratedPubKey(state, action: PayloadAction) { return { ...state, hexGeneratedPubKey: action.payload }; }, - setPrivateKeyBytesHex(state, action: PayloadAction) { - return { ...state, privateKeyBytesHex: action.payload }; - }, setDisplayName(state, action: PayloadAction) { return { ...state, displayName: action.payload }; }, @@ -114,7 +109,6 @@ export const { setRecoveryPassword, setRecoveryPasswordError, setHexGeneratedPubKey, - setPrivateKeyBytesHex, setDisplayName, setDisplayNameError, } = registrationSlice.actions; diff --git a/ts/state/onboarding/selectors/registration.ts b/ts/state/onboarding/selectors/registration.ts index 0f65c19ac..ba22b5191 100644 --- a/ts/state/onboarding/selectors/registration.ts +++ b/ts/state/onboarding/selectors/registration.ts @@ -54,11 +54,6 @@ const getHexGeneratedPubKey = createSelector( (state: OnboardingState): string => state.hexGeneratedPubKey ); -const getPrivateKeyBytesHex = createSelector( - getRegistration, - (state: OnboardingState): string | undefined => state.privateKeyBytesHex -); - const getDisplayName = createSelector( getRegistration, (state: OnboardingState): string => state.displayName @@ -103,10 +98,6 @@ export const useOnboardHexGeneratedPubKey = () => { return useSelector(getHexGeneratedPubKey); }; -export const useOnboardPrivateKeyBytesHex = () => { - return useSelector(getPrivateKeyBytesHex); -}; - export const useDisplayName = () => { return useSelector(getDisplayName); };