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: multisrp ui #29816

Closed
wants to merge 241 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
241 commits
Select commit Hold shift + click to select a range
ce87824
feat: multip SRP PoC
PatrykLucka Dec 5, 2024
5b9bf58
feat(multi-srp): add keyring id
PatrykLucka Dec 9, 2024
cc9cd94
chore(multi-srp): add code fences
PatrykLucka Dec 9, 2024
ae06ccf
chore(multi-srp): add import codefence, tests and story
PatrykLucka Dec 9, 2024
9771fe5
chore(multi-srp): change js component to tsx + use accountController …
PatrykLucka Dec 10, 2024
33740d1
feat(multi-srp): add more accounts from imported SRP if they have any…
PatrykLucka Dec 10, 2024
ef4d9e2
Apply suggestions from code review
PatrykLucka Dec 11, 2024
a2a07db
chore: Apply suggestions from code review
PatrykLucka Dec 11, 2024
8c01287
feat(multi-srp): use toast as success message
PatrykLucka Dec 11, 2024
c169e2b
chore: use preview build for keyring-controller
PatrykLucka Dec 11, 2024
a5cfec3
fix: update to pass typeIndex as param
montelaidev Dec 12, 2024
c26ac36
feat(multi-srp): add select srp UI
PatrykLucka Dec 12, 2024
4648cd9
feat: add test for reveal seed
montelaidev Dec 12, 2024
491e3bb
feat: add `generateNewHdKeyring`
montelaidev Dec 13, 2024
b62d838
feat(multi-srp): create account from srp UI
PatrykLucka Dec 17, 2024
edc978f
Merge branch 'mmmsrp-9' into multi-srp-mvp
PatrykLucka Dec 17, 2024
ff891e0
refactor: use keyring index instead of id and typeIndex
PatrykLucka Jan 8, 2025
2e69c3b
feat: add import srp word list ui
montelaidev Jan 13, 2025
b3b1522
feat: multip SRP PoC
PatrykLucka Dec 5, 2024
6824d52
feat(multi-srp): add keyring id
PatrykLucka Dec 9, 2024
6fc4744
chore(multi-srp): add code fences
PatrykLucka Dec 9, 2024
e904582
chore(multi-srp): add import codefence, tests and story
PatrykLucka Dec 9, 2024
c5d819a
chore(multi-srp): change js component to tsx + use accountController …
PatrykLucka Dec 10, 2024
1cd827b
feat(multi-srp): add more accounts from imported SRP if they have any…
PatrykLucka Dec 10, 2024
d18fd69
Apply suggestions from code review
PatrykLucka Dec 11, 2024
f16ae0a
chore: Apply suggestions from code review
PatrykLucka Dec 11, 2024
a26d104
feat(multi-srp): use toast as success message
PatrykLucka Dec 11, 2024
8e612fc
chore: use preview build for keyring-controller
PatrykLucka Dec 11, 2024
2013282
feat(multi-srp): add select srp UI
PatrykLucka Dec 12, 2024
079bffe
feat(multi-srp): create account from srp UI
PatrykLucka Dec 17, 2024
5c47583
fix: update to pass typeIndex as param
montelaidev Dec 12, 2024
c1adf77
feat: add test for reveal seed
montelaidev Dec 12, 2024
3992ba1
feat: add `generateNewHdKeyring`
montelaidev Dec 13, 2024
315d3fe
refactor: use keyring index instead of id and typeIndex
PatrykLucka Jan 8, 2025
8c7fc6a
feat: multip SRP PoC
PatrykLucka Dec 5, 2024
6eb0458
feat(multi-srp): add keyring id
PatrykLucka Dec 9, 2024
50f0adf
chore(multi-srp): add code fences
PatrykLucka Dec 9, 2024
5c4c6af
chore(multi-srp): add import codefence, tests and story
PatrykLucka Dec 9, 2024
8a09e41
chore(multi-srp): change js component to tsx + use accountController …
PatrykLucka Dec 10, 2024
f51517f
feat(multi-srp): add more accounts from imported SRP if they have any…
PatrykLucka Dec 10, 2024
b62fb4d
Apply suggestions from code review
PatrykLucka Dec 11, 2024
d47b04f
chore: Apply suggestions from code review
PatrykLucka Dec 11, 2024
1c5c968
feat(multi-srp): use toast as success message
PatrykLucka Dec 11, 2024
c9f121c
chore: use preview build for keyring-controller
PatrykLucka Dec 11, 2024
b940893
feat(multi-srp): create account from srp UI
PatrykLucka Dec 17, 2024
39e66a0
fix: update to pass typeIndex as param
montelaidev Dec 12, 2024
4019541
refactor: use keyring index instead of id and typeIndex
PatrykLucka Jan 8, 2025
816069a
feat: add reveal srp to hd accounts.
montelaidev Jan 14, 2025
2470ec7
fix: multisrp fence
montelaidev Jan 16, 2025
55e184b
Merge branch 'multi-srp-mvp-import-srp-ui' into multi-srp-mvp
PatrykLucka Jan 16, 2025
3332a8d
feat(multi-srp): use keyringId instead of indexes
PatrykLucka Jan 18, 2025
626aa9a
fix: multi-srp fence
montelaidev Jan 20, 2025
fee1ad7
fix: reveal srp list test
montelaidev Jan 20, 2025
f86411c
feat(dep): add ulid dep
montelaidev Jan 20, 2025
e0e65d2
feat: add migration for keyringMetadata
montelaidev Jan 20, 2025
50085f5
feat: add srp labels to account list
montelaidev Jan 20, 2025
d049163
fix: migration to check for keyrings
montelaidev Jan 21, 2025
3ed94e4
fix: popup window where it only shows one column
montelaidev Jan 21, 2025
da53e11
fix: add pill test
montelaidev Jan 21, 2025
4105e32
fix: dedupe
montelaidev Jan 21, 2025
4d77d64
fix: add keyringsMetadata to storybook mock state
montelaidev Jan 21, 2025
fe1c1d9
fix: lint
montelaidev Jan 21, 2025
78c4dd8
fix: test for security tab
montelaidev Jan 21, 2025
bc44d97
fix: fences
montelaidev Jan 21, 2025
6d9df02
fix: lint
montelaidev Jan 21, 2025
804a2b0
fix: update policies
montelaidev Jan 21, 2025
e3c0e1f
fix: remove unused locales
montelaidev Jan 21, 2025
8e8dfc4
fix: locales
montelaidev Jan 21, 2025
9dd5265
fix: move migration to 140
montelaidev Jan 21, 2025
ab90ff6
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Jan 21, 2025
f6893d1
fix: remove fence for srp list route
montelaidev Jan 21, 2025
0a1b531
fix: add keyringsMetadata to fixtures
montelaidev Jan 22, 2025
a76d684
fix: build assets for multi-srp to exclude srp-list
montelaidev Jan 22, 2025
61f91ca
fix: lint in multi-srp scss
montelaidev Jan 22, 2025
f50bf95
fix: add keyringsMetadata to state snapshots
montelaidev Jan 22, 2025
362eeb3
Update LavaMoat policies
metamaskbot Jan 22, 2025
aa7a773
fix: allow crypto for ulid
montelaidev Jan 22, 2025
e970f49
fix: reveal srp e2e test
montelaidev Jan 23, 2025
39315a6
fix: swaps importAccountButton text
montelaidev Jan 23, 2025
c6cfda1
Update LavaMoat policies
metamaskbot Jan 23, 2025
4912a03
fix: migration to use AccountsController to get the number of keyrings
montelaidev Jan 23, 2025
2bb8231
fix: clear srp after import
montelaidev Jan 23, 2025
094ae81
fix: remove generate new srp from menu
montelaidev Jan 23, 2025
9cfc05a
fix: lint and fence
montelaidev Jan 23, 2025
3caaad5
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Jan 28, 2025
f766fce
fix: dedupe
montelaidev Jan 28, 2025
b4cea71
feat: add tests
montelaidev Jan 28, 2025
ba8f8a1
fix: use preview build
montelaidev Jan 28, 2025
fc18d66
refactor: update to use withKeyring
montelaidev Jan 28, 2025
de6deb4
fix: remove test
montelaidev Jan 28, 2025
f8cab8e
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Jan 28, 2025
604db70
feat: add preview builds for multisrp
montelaidev Jan 28, 2025
6ac5185
fix: fence and remove keyringMetadata
montelaidev Jan 28, 2025
3b2e7c6
fix: fence and remove keyringMetadata
montelaidev Jan 28, 2025
89daacf
Update LavaMoat policies
metamaskbot Jan 28, 2025
638e15d
temp: skip addNewAccount tests
montelaidev Jan 28, 2025
e1fe409
fix: add policy override
montelaidev Jan 28, 2025
f5893ad
temp: skip addNewAccount tests
montelaidev Jan 28, 2025
a3cb5bd
fix: add policy override
montelaidev Jan 28, 2025
4608488
fix: addNewAccount to return address
montelaidev Jan 28, 2025
1b6f9e4
fix: addNewAccount to return address
montelaidev Jan 28, 2025
89ae583
fix:lint
montelaidev Jan 28, 2025
757d783
fix: use fingerprint in account-details
montelaidev Jan 28, 2025
de9ad83
fix: _addAccountsWithBalance to use addAccounts
montelaidev Feb 3, 2025
e31440d
fix: update preview build
montelaidev Feb 3, 2025
160ca46
Merge remote-tracking branch 'origin/main' into feat/multi-srp-api
montelaidev Feb 3, 2025
7945a49
Update LavaMoat policies
metamaskbot Feb 3, 2025
b714456
fix: lint
montelaidev Feb 3, 2025
2529ba0
Merge remote-tracking branch 'origin/feat/multi-srp-api' into multi-s…
montelaidev Feb 3, 2025
db07803
fix: tests
montelaidev Feb 3, 2025
fb23978
revert: state snapshots to remove keyring metadata
montelaidev Feb 4, 2025
1af1110
revert: to use keyringMetadata
montelaidev Feb 5, 2025
b7b9857
fix: lint and update policy
montelaidev Feb 5, 2025
c3f9a40
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 5, 2025
9637133
fix: update error snapshot
montelaidev Feb 5, 2025
f79330c
fix: test for list srp
montelaidev Feb 5, 2025
05580d8
revert: privacy snapshot update
montelaidev Feb 5, 2025
ce0ae19
Merge remote-tracking branch 'origin/main' into feat/multi-srp-api
montelaidev Feb 6, 2025
dae349b
revert: use keyringMetadata
montelaidev Feb 6, 2025
98cc801
fix: update preview build
montelaidev Feb 6, 2025
3a50055
fix: remove skip of tests
montelaidev Feb 6, 2025
97777e8
fix: update preview build
montelaidev Feb 6, 2025
72d8db0
fix: remove comments and a spyOn
montelaidev Feb 6, 2025
f9ca158
fix: lint
montelaidev Feb 6, 2025
8dd7736
fix: update policy
montelaidev Feb 6, 2025
33c07e6
fix: update selector
montelaidev Feb 6, 2025
0312f63
fix: update policy to allowcrypto for ulid in keyring controller
montelaidev Feb 6, 2025
1021f49
Merge remote-tracking branch 'origin/feat/multi-srp-api' into multi-s…
montelaidev Feb 6, 2025
df6b17b
fix: update utils test and remove mock in setup
montelaidev Feb 6, 2025
b455c12
fix: update policy and remove ulid
montelaidev Feb 6, 2025
b6e7b49
feat: add multisrp e2e tests
montelaidev Feb 6, 2025
d4d3256
fix: throw if srp has already been imported
montelaidev Feb 7, 2025
3831f1a
fix: remove length check
montelaidev Feb 7, 2025
37f10fb
fix: update preview dep
montelaidev Feb 13, 2025
f6bed6d
fix: add tests for multiple srps when revealing srp from settings
montelaidev Feb 14, 2025
3eb2b23
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 14, 2025
858f7d9
fix: add test for duplicate srp import
montelaidev Feb 14, 2025
481533e
fix: show srp backup only for primary srp
montelaidev Feb 14, 2025
7ece01d
fix: return false for reminder if locked
montelaidev Feb 14, 2025
2ca6b57
fix: display error for import srp
montelaidev Feb 14, 2025
e0c6464
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 18, 2025
aea3148
feat: multisrp support in the background
montelaidev Feb 18, 2025
d2acbae
fix: remove skip
montelaidev Feb 19, 2025
ab31dda
fix: skip and update test
montelaidev Feb 19, 2025
3905133
fix: update lock
montelaidev Feb 19, 2025
c704389
fix: update lock to use 8.1.1 for simple keyring
montelaidev Feb 19, 2025
aa089d4
Update LavaMoat policies
metamaskbot Feb 19, 2025
57eaafd
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 19, 2025
e7f291e
fix: remove skip
montelaidev Feb 19, 2025
f13d425
fix: skip and update test
montelaidev Feb 19, 2025
eb98af7
fix: update lock to use 8.1.1 for simple keyring
montelaidev Feb 19, 2025
80ff1cf
fix: yarn lock
metamaskbot Feb 19, 2025
1704284
Update LavaMoat policies
metamaskbot Feb 19, 2025
894e635
fix: test and lint
montelaidev Feb 19, 2025
5fbefea
fix: lint
montelaidev Feb 19, 2025
04ba471
fix: add locale to en_GB
montelaidev Feb 19, 2025
1afe808
fix: locales
montelaidev Feb 19, 2025
3f1b048
fix: update dep and policy
montelaidev Feb 19, 2025
f26d1fb
fix: srp e2e
montelaidev Feb 19, 2025
85c4744
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 19, 2025
e85d749
chore: remove unused
montelaidev Feb 19, 2025
95bb1f2
fix: check if primary keyring exists
montelaidev Feb 19, 2025
b2c80e3
Update LavaMoat policies
metamaskbot Feb 19, 2025
1d6ed72
fix: flask e2e
montelaidev Feb 19, 2025
d23264e
fix: remove focused test
montelaidev Feb 19, 2025
903fcd7
fix: add delay when opening reveal srp
montelaidev Feb 19, 2025
8ae9a16
Merge remote-tracking branch 'origin/main' into feat/multi-srp-api
montelaidev Feb 19, 2025
ed84ea4
revert: use old logic of accountCount
montelaidev Feb 20, 2025
64982ba
Update app/scripts/metamask-controller.actions.test.js
montelaidev Feb 20, 2025
0398d0d
fix: fence
montelaidev Feb 20, 2025
a78f71e
fix: missing import
montelaidev Feb 20, 2025
d601ca8
fix: callback stub
montelaidev Feb 20, 2025
4ce412f
Merge remote-tracking branch 'origin/main' into feat/multi-srp-api
montelaidev Feb 20, 2025
a78da1e
fix: update policy
montelaidev Feb 20, 2025
1236b5c
Update LavaMoat policies
metamaskbot Feb 20, 2025
479fdb1
fix: state name
montelaidev Feb 20, 2025
2f2652b
fix: add comment and remove while true condition.
montelaidev Feb 20, 2025
3c3d5f1
fix: refactor destructuring and add comments
montelaidev Feb 20, 2025
284f7ba
fix: remove while true
montelaidev Feb 20, 2025
4cb038d
fix: re-add test
montelaidev Feb 20, 2025
db414f7
fix: update logic to find the most recent keyring index.
montelaidev Feb 21, 2025
a5d982a
feat: add auto hide to srp toast
montelaidev Feb 21, 2025
6817690
feat: dismiss toast if the user click the account menu.
montelaidev Feb 21, 2025
83edc8f
fix: lint
montelaidev Feb 21, 2025
b6dcfb0
fix: update logic for addNewMnemonicToVault
montelaidev Feb 21, 2025
cb1232f
fix: rename addNewMnemonicToVault to importMnemonicToVault
montelaidev Feb 21, 2025
3d87720
fix: add test for original metadata id
montelaidev Feb 21, 2025
325fd99
Merge remote-tracking branch 'origin/main' into feat/multi-srp-api
montelaidev Feb 21, 2025
492f0cf
fix: update name in test
montelaidev Feb 21, 2025
0efb0b0
Apply suggestions from code review
montelaidev Feb 21, 2025
32c9f91
fix: change from oldAccounts to accountsInKeyring
montelaidev Feb 21, 2025
f1639ea
fix: name in getApi
montelaidev Feb 21, 2025
512005d
Apply suggestions from code review
montelaidev Feb 21, 2025
d20c8b1
fix: test
montelaidev Feb 21, 2025
dcf8049
fix: lint
montelaidev Feb 21, 2025
55d7f33
fix: change from fingerprint to id
montelaidev Feb 21, 2025
c82afe4
Apply suggestions from code review
montelaidev Feb 21, 2025
ebfd25e
Merge remote-tracking branch 'origin/main' into feat/multi-srp-api
montelaidev Feb 22, 2025
2d3d190
Merge remote-tracking branch 'origin/feat/multi-srp-api' into multi-s…
montelaidev Feb 23, 2025
c28d354
Update LavaMoat policies
metamaskbot Feb 23, 2025
ff1a971
fix: fixed code for keyring logic
montelaidev Feb 24, 2025
d56871e
fix: dedupe
montelaidev Feb 24, 2025
5c419b2
Update LavaMoat policies
metamaskbot Feb 24, 2025
0e8f3d9
fix: keyring check in fence
montelaidev Feb 24, 2025
d762837
fix: update tests
montelaidev Feb 24, 2025
ef146eb
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 24, 2025
e7d46a5
fix: import srp test
montelaidev Feb 24, 2025
092c993
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 24, 2025
b551e58
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 25, 2025
60ff1ce
fix: scroll
montelaidev Feb 25, 2025
fc39d52
revert: srp pill.
montelaidev Feb 25, 2025
0b38445
revert: removed test
montelaidev Feb 25, 2025
5a3a93e
fix: remove metric
montelaidev Feb 25, 2025
39b79a8
fix: address comments and typos
montelaidev Feb 25, 2025
301d939
feat: add getMetaMaskHdKeyrings
montelaidev Feb 25, 2025
5cee12c
fix: move findKeyringByAddress to shared.
montelaidev Feb 26, 2025
47ba75e
fix: fence
montelaidev Feb 26, 2025
267e057
Merge remote-tracking branch 'origin/main' into multi-srp-mvp-2
montelaidev Feb 26, 2025
bb10190
fix: move delay before openSRPList
montelaidev Feb 26, 2025
e414dd6
fix: lint
montelaidev Feb 26, 2025
9ae4eaf
fix: storybook
montelaidev Feb 26, 2025
8e73462
fix: fence
montelaidev Feb 26, 2025
ef724ab
fix: add fence and fix e2e test
montelaidev Feb 26, 2025
caeaa1d
fix: add fenced srp list route
montelaidev Feb 26, 2025
196725d
fix: add account headings
montelaidev Feb 26, 2025
681c1e8
fix: lint and test
montelaidev Feb 26, 2025
2c07d17
fix: fence and update solana selector in e2e
montelaidev Feb 26, 2025
396b2e0
fix: e2e selectors
montelaidev Feb 26, 2025
525ad0b
refactor: move keyringId utils to shared/lib and move AttemptExportSt…
montelaidev Feb 26, 2025
224dee8
fix: fence
montelaidev Feb 26, 2025
b3b3518
fix: address comments
montelaidev Feb 26, 2025
06ee5be
fix: renaming import
montelaidev Feb 26, 2025
4418a35
fix: update copy
montelaidev Feb 26, 2025
00c7c20
fix: remove comma
montelaidev Feb 26, 2025
4b9e6ba
fix: lint
montelaidev Feb 26, 2025
728bf56
refactor: use getMetaMaskAccounts
montelaidev Feb 26, 2025
d95b02e
refactor: display balances
montelaidev Feb 26, 2025
57c79c1
fix: fence to allow getMetaMaskHdKeyrings
montelaidev Feb 26, 2025
cac6339
fix: lint
montelaidev Feb 26, 2025
5f2aeaf
fix: srplist account balance
montelaidev Feb 26, 2025
945c285
fix: fence and remove comments
montelaidev Feb 26, 2025
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
15 changes: 14 additions & 1 deletion .storybook/test-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,10 @@ import { copyable, divider, heading, panel, text } from '@metamask/snaps-sdk';
import { getJsxElementFromComponent } from '@metamask/snaps-utils';
import { FirstTimeFlowType } from '../shared/constants/onboarding';
import { ETH_EOA_METHODS } from '../shared/constants/eth-methods';
import { mockNetworkState, mockMultichainNetworkState } from '../test/stub/networks';
import {
mockNetworkState,
mockMultichainNetworkState,
} from '../test/stub/networks';

const state = {
invalidCustomNetwork: {
Expand Down Expand Up @@ -1257,6 +1260,16 @@ const state = {
accounts: ['0x9d0ba4ddac06032527b140912ec808ab9451b788'],
},
],
keyringsMetadata: [
{
id: '01JN08SYECPZHFHB3K0J1NHJ4H',
name: '',
},
{
id: '01JN08T38HEXPYQX2HKP1FCRMZ',
name: '',
},
],
...mockNetworkState(
{
id: 'test-networkConfigurationId-1',
Expand Down
3 changes: 0 additions & 3 deletions app/_locales/am/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/_locales/ar/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/_locales/bg/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/_locales/bn/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/_locales/ca/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/_locales/cs/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 0 additions & 3 deletions app/_locales/da/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions app/_locales/de/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions app/_locales/el/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 51 additions & 6 deletions app/_locales/en/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

65 changes: 55 additions & 10 deletions app/_locales/en_GB/messages.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading