Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Restore from mnemonic in 2.0 #7955

Merged
merged 61 commits into from
Feb 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
0e58e1a
refactor(2.0): Dynamic password
marc2332 Dec 21, 2023
2b25b9b
refactor(2.0): Remove Profile Manager (wip)
marc2332 Dec 22, 2023
027b69d
clean up and fix
marc2332 Dec 22, 2023
4bf970b
clean up
marc2332 Dec 22, 2023
d5f50d5
Merge branch 'refactor/dynamic-password' into refactor/remove-profile…
marc2332 Dec 22, 2023
a5a8969
clean up more code
marc2332 Dec 22, 2023
628f376
clean up
marc2332 Jan 8, 2024
60c6836
adapt and remove for profile-manager related code
marc2332 Jan 9, 2024
cc59db7
clean up more code
marc2332 Jan 10, 2024
3080203
fmt
marc2332 Jan 10, 2024
7457f42
Merge branch 'develop-iota2.0' into refactor/dynamic-password
marc2332 Jan 10, 2024
cff2fa6
more cleanup
marc2332 Jan 10, 2024
064d8c5
more cleanup
marc2332 Jan 11, 2024
10105c0
small tweaks
marc2332 Jan 12, 2024
38b7c9b
more cleanup
marc2332 Jan 15, 2024
3a885f6
Merge branch 'develop-iota2.0' into refactor/dynamic-password
marc2332 Jan 15, 2024
071bffc
format
marc2332 Jan 15, 2024
8445a28
Merge branch 'refactor/dynamic-password' into refactor/remove-profile…
marc2332 Jan 15, 2024
df286ea
Merge branch 'develop-iota2.0' into refactor/dynamic-password
begonaalvarezd Jan 16, 2024
67eba8c
update
marc2332 Jan 16, 2024
f8ba63f
clean up
marc2332 Jan 16, 2024
63e6125
Merge branch 'refactor/dynamic-password' into refactor/remove-profile…
marc2332 Jan 16, 2024
5f2a5fd
Merge branch 'develop-iota2.0' into refactor/remove-profile-manager
marc2332 Jan 16, 2024
c5d653d
resolve conflicts and clean up other stuff
marc2332 Jan 17, 2024
f5acc83
https://api.testnet.shimmer.network
marc2332 Jan 17, 2024
84b875f
revert Wallet.svelte
marc2332 Jan 17, 2024
71e06b9
clean up
marc2332 Jan 17, 2024
4cf6327
remove account debris
marc2332 Jan 18, 2024
e4a884e
resolve conflicts
marc2332 Jan 29, 2024
6ecfa1d
feat: Profile-centric file scheme for wallets
marc2332 Jan 29, 2024
ecb5fa1
chore: Clean up 2.0 comments
marc2332 Jan 29, 2024
7637dbb
more
marc2332 Jan 29, 2024
73779d8
more
marc2332 Jan 29, 2024
3673d25
more
marc2332 Jan 29, 2024
1d645e4
Merge branch 'chore/clean-up-2.0-comments' into feat/profile-centric-…
marc2332 Jan 30, 2024
6e8dcd5
works
marc2332 Jan 30, 2024
72383a7
clean up
marc2332 Jan 31, 2024
d4dc55c
clean up
marc2332 Jan 31, 2024
599a98f
clean up
marc2332 Jan 31, 2024
bb26153
Merge branch 'chore/clean-up-2.0-comments' of https://github.com/iota…
marc2332 Jan 31, 2024
c994e77
chore: Simplify path management
marc2332 Jan 31, 2024
52c1e02
fmt
marc2332 Jan 31, 2024
e901a40
chore: Adapt to sdk changes
marc2332 Jan 31, 2024
2cb0e27
Merge branch 'chore/adapt-to-sdk-changes' into chore/simplify-path-ma…
marc2332 Jan 31, 2024
e2e2ae1
Merge branch 'chore/clean-up-2.0-comments' into chore/adapt-to-sdk-ch…
marc2332 Jan 31, 2024
1b19967
Merge branch 'chore/adapt-to-sdk-changes' into chore/simplify-path-ma…
marc2332 Jan 31, 2024
7d8912f
Merge branch 'chore/adapt-to-sdk-changes' into feat/profile-centric-w…
marc2332 Jan 31, 2024
9b8bc3e
Merge branch 'feat/profile-centric-wallet-file-scheme' into chore/sim…
marc2332 Jan 31, 2024
c87689b
Merge branch 'refactor/remove-account-debris' into chore/clean-up-2.0…
marc2332 Jan 31, 2024
f9cf60e
Merge branch 'chore/clean-up-2.0-comments' into chore/adapt-to-sdk-ch…
marc2332 Jan 31, 2024
442cfbd
fmt
marc2332 Jan 31, 2024
dbd8405
Merge branch 'chore/adapt-to-sdk-changes' into feat/profile-centric-w…
marc2332 Jan 31, 2024
6aa8dde
Merge branch 'feat/profile-centric-wallet-file-scheme' into chore/sim…
marc2332 Jan 31, 2024
57c779c
clean up
marc2332 Jan 31, 2024
0593fb1
feat: Restore from mnemonic
marc2332 Feb 1, 2024
e36facb
resolve conflicts
marc2332 Feb 2, 2024
f26de9b
Merge branch 'develop-iota2.0' into chore/simplify-path-management
marc2332 Feb 5, 2024
a079de7
Merge branch 'chore/simplify-path-management' into feat/restore-from-…
marc2332 Feb 5, 2024
0eccdd3
resolve conflicts
marc2332 Feb 6, 2024
f070fa7
enable features
marc2332 Feb 6, 2024
f4bdb0d
Merge branch 'develop-iota2.0' into feat/restore-from-mnemonic
begonaalvarezd Feb 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/desktop/features/onboarding.features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ const onboardingFeaturesForTestnet: IOnboardingFeaturesForNetwork = {
},
},
restoreProfile: {
enabled: false,
enabled: true,
recoveryPhrase: {
enabled: false,
enabled: true,
},
strongholdBackup: {
enabled: false,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
<script lang="ts">
import { OnboardingLayout } from '@components'
import {
RestoreProfileType,
initialiseOnboardingProfile,
onboardingProfile,
updateOnboardingProfile,
} from '@contexts/onboarding'
import { RestoreProfileType, onboardingProfile, updateOnboardingProfile } from '@contexts/onboarding'
import { localize } from '@core/i18n'
import { getNetworkNameFromNetworkId } from '@core/network'
import { ProfileType, clearProfileFromMemory, removeProfileFolder } from '@core/profile'
import {
DirectoryManager,
ProfileType,
clearProfileFromMemory,
getSecretManagerFromProfileType,
removeProfileFolder,
} from '@core/profile'
import features from '@features/features'
import { Animation, OnboardingButton, Text } from '@ui'
import { onMount } from 'svelte'
Expand All @@ -29,8 +30,9 @@
async function onProfileTypeClick(restoreProfileType: RestoreProfileType): Promise<void> {
isBusy = { ...isBusy, [restoreProfileType]: true }
const type = restoreProfileType === RestoreProfileType.Ledger ? ProfileType.Ledger : ProfileType.Software
updateOnboardingProfile({ type, restoreProfileType })
await initialiseOnboardingProfile()
const secretManagerPath = await DirectoryManager.forSecretManager($onboardingProfile.id)
const secretManagerOptions = getSecretManagerFromProfileType(type, secretManagerPath)
updateOnboardingProfile({ restoreProfileType, type, secretManagerOptions })
$restoreProfileRouter.next()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { isOnboardingLedgerProfile, onboardingProfile, onboardingProfileSecretMa
*/
export async function initialiseOnboardingProfile(
isDeveloperProfile = false,
destroyPreviousSecretManager = false
destroyPreviousSecretManager = true
): Promise<void> {
if (get(onboardingProfileSecretManager)) {
if (destroyPreviousSecretManager) {
Expand Down
Loading