Skip to content

Commit

Permalink
Merge branch 'develop' into developer-settings
Browse files Browse the repository at this point in the history
  • Loading branch information
pnarayanaswamy authored Jul 18, 2024
2 parents 4ebf249 + 15cd69d commit ddbc44e
Show file tree
Hide file tree
Showing 21 changed files with 5,743 additions and 203 deletions.
407 changes: 395 additions & 12 deletions app/_locales/de/messages.json

Large diffs are not rendered by default.

407 changes: 395 additions & 12 deletions app/_locales/el/messages.json

Large diffs are not rendered by default.

414 changes: 400 additions & 14 deletions app/_locales/es/messages.json

Large diffs are not rendered by default.

409 changes: 396 additions & 13 deletions app/_locales/fr/messages.json

Large diffs are not rendered by default.

394 changes: 390 additions & 4 deletions app/_locales/hi/messages.json

Large diffs are not rendered by default.

417 changes: 400 additions & 17 deletions app/_locales/id/messages.json

Large diffs are not rendered by default.

424 changes: 405 additions & 19 deletions app/_locales/ja/messages.json

Large diffs are not rendered by default.

416 changes: 401 additions & 15 deletions app/_locales/ko/messages.json

Large diffs are not rendered by default.

409 changes: 396 additions & 13 deletions app/_locales/pt/messages.json

Large diffs are not rendered by default.

399 changes: 391 additions & 8 deletions app/_locales/ru/messages.json

Large diffs are not rendered by default.

414 changes: 400 additions & 14 deletions app/_locales/tl/messages.json

Large diffs are not rendered by default.

409 changes: 396 additions & 13 deletions app/_locales/tr/messages.json

Large diffs are not rendered by default.

416 changes: 401 additions & 15 deletions app/_locales/vi/messages.json

Large diffs are not rendered by default.

396 changes: 391 additions & 5 deletions app/_locales/zh_CN/messages.json

Large diffs are not rendered by default.

29 changes: 26 additions & 3 deletions lavamoat/browserify/beta/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1643,14 +1643,22 @@
"@metamask/keyring-controller": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/base-controller": true,
"@metamask/browser-passworder": true,
"@metamask/eth-sig-util": true,
"@metamask/keyring-controller>@metamask/base-controller": true,
"@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
"@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
"@metamask/keyring-controller>@metamask/utils": true,
"@metamask/keyring-controller>ethereumjs-wallet": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/utils": true
"@metamask/name-controller>async-mutex": true
}
},
"@metamask/keyring-controller>@metamask/base-controller": {
"globals": {
"setTimeout": true
},
"packages": {
"immer": true
}
},
"@metamask/keyring-controller>@metamask/eth-hd-keyring": {
Expand All @@ -1676,6 +1684,21 @@
"mocha>serialize-javascript>randombytes": true
}
},
"@metamask/keyring-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/keyring-controller>ethereumjs-wallet": {
"packages": {
"@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
Expand Down
29 changes: 26 additions & 3 deletions lavamoat/browserify/flask/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1643,14 +1643,22 @@
"@metamask/keyring-controller": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/base-controller": true,
"@metamask/browser-passworder": true,
"@metamask/eth-sig-util": true,
"@metamask/keyring-controller>@metamask/base-controller": true,
"@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
"@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
"@metamask/keyring-controller>@metamask/utils": true,
"@metamask/keyring-controller>ethereumjs-wallet": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/utils": true
"@metamask/name-controller>async-mutex": true
}
},
"@metamask/keyring-controller>@metamask/base-controller": {
"globals": {
"setTimeout": true
},
"packages": {
"immer": true
}
},
"@metamask/keyring-controller>@metamask/eth-hd-keyring": {
Expand All @@ -1676,6 +1684,21 @@
"mocha>serialize-javascript>randombytes": true
}
},
"@metamask/keyring-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/keyring-controller>ethereumjs-wallet": {
"packages": {
"@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
Expand Down
29 changes: 26 additions & 3 deletions lavamoat/browserify/main/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1643,14 +1643,22 @@
"@metamask/keyring-controller": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/base-controller": true,
"@metamask/browser-passworder": true,
"@metamask/eth-sig-util": true,
"@metamask/keyring-controller>@metamask/base-controller": true,
"@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
"@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
"@metamask/keyring-controller>@metamask/utils": true,
"@metamask/keyring-controller>ethereumjs-wallet": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/utils": true
"@metamask/name-controller>async-mutex": true
}
},
"@metamask/keyring-controller>@metamask/base-controller": {
"globals": {
"setTimeout": true
},
"packages": {
"immer": true
}
},
"@metamask/keyring-controller>@metamask/eth-hd-keyring": {
Expand All @@ -1676,6 +1684,21 @@
"mocha>serialize-javascript>randombytes": true
}
},
"@metamask/keyring-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/keyring-controller>ethereumjs-wallet": {
"packages": {
"@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
Expand Down
29 changes: 26 additions & 3 deletions lavamoat/browserify/mmi/policy.json
Original file line number Diff line number Diff line change
Expand Up @@ -1735,14 +1735,22 @@
"@metamask/keyring-controller": {
"packages": {
"@ethereumjs/tx>@ethereumjs/util": true,
"@metamask/base-controller": true,
"@metamask/browser-passworder": true,
"@metamask/eth-sig-util": true,
"@metamask/keyring-controller>@metamask/base-controller": true,
"@metamask/keyring-controller>@metamask/eth-hd-keyring": true,
"@metamask/keyring-controller>@metamask/eth-simple-keyring": true,
"@metamask/keyring-controller>@metamask/utils": true,
"@metamask/keyring-controller>ethereumjs-wallet": true,
"@metamask/name-controller>async-mutex": true,
"@metamask/utils": true
"@metamask/name-controller>async-mutex": true
}
},
"@metamask/keyring-controller>@metamask/base-controller": {
"globals": {
"setTimeout": true
},
"packages": {
"immer": true
}
},
"@metamask/keyring-controller>@metamask/eth-hd-keyring": {
Expand All @@ -1768,6 +1776,21 @@
"mocha>serialize-javascript>randombytes": true
}
},
"@metamask/keyring-controller>@metamask/utils": {
"globals": {
"TextDecoder": true,
"TextEncoder": true
},
"packages": {
"@metamask/rpc-errors>@metamask/utils>@metamask/superstruct": true,
"@metamask/utils>@scure/base": true,
"@metamask/utils>pony-cause": true,
"@noble/hashes": true,
"browserify>buffer": true,
"nock>debug": true,
"semver": true
}
},
"@metamask/keyring-controller>ethereumjs-wallet": {
"packages": {
"@metamask/keyring-controller>ethereumjs-wallet>ethereum-cryptography": true,
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@
"@metamask/gas-fee-controller": "^18.0.0",
"@metamask/jazzicon": "^2.0.0",
"@metamask/keyring-api": "^8.0.0",
"@metamask/keyring-controller": "^16.1.0",
"@metamask/keyring-controller": "^17.1.1",
"@metamask/logging-controller": "^3.0.1",
"@metamask/logo": "^3.1.2",
"@metamask/message-manager": "^7.3.0",
Expand Down
65 changes: 65 additions & 0 deletions test/e2e/accounts/forgot-password.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import { Suite } from 'mocha';
import { unlockWallet, withFixtures, TEST_SEED_PHRASE_TWO } from '../helpers';
import FixtureBuilder from '../fixture-builder';
import { Driver } from '../webdriver/driver';

const newPassword = 'this is the best password ever';

describe('Forgot password', function (this: Suite) {
it('resets password and then unlock wallet with new password', async function () {
await withFixtures(
{
fixtures: new FixtureBuilder().build(),
title: this.test?.fullTitle(),
},
async ({ driver }: { driver: Driver }) => {
await unlockWallet(driver);

// Lock Wallet
await driver.waitForSelector(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement({
text: 'Lock MetaMask',
tag: 'div',
});

// Go to reset password page
await driver.waitForSelector('.unlock-page__link');
await driver.clickElement({
text: 'Forgot password?',
tag: 'a',
});

// Reset password with a new password
await driver.pasteIntoField(
'[data-testid="import-srp__srp-word-0"]',
TEST_SEED_PHRASE_TWO,
);

await driver.fill('#password', newPassword);
await driver.fill('#confirm-password', newPassword);
await driver.press('#confirm-password', driver.Key.ENTER);

// Lock wallet again
await driver.waitForSelector(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement(
'[data-testid="account-options-menu-button"]',
);
await driver.clickElement({
text: 'Lock MetaMask',
tag: 'div',
});

// log in with new password
await driver.fill('#password', newPassword);
await driver.press('#password', driver.Key.ENTER);
},
);
});
});
32 changes: 16 additions & 16 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5648,7 +5648,7 @@ __metadata:
languageName: node
linkType: hard

"@metamask/keyring-controller@npm:^16.0.0, @metamask/keyring-controller@npm:^16.1.0":
"@metamask/keyring-controller@npm:^16.0.0":
version: 16.1.0
resolution: "@metamask/keyring-controller@npm:16.1.0"
dependencies:
Expand All @@ -5669,24 +5669,24 @@ __metadata:
languageName: node
linkType: hard

"@metamask/keyring-controller@npm:^17.1.0":
version: 17.1.0
resolution: "@metamask/keyring-controller@npm:17.1.0"
"@metamask/keyring-controller@npm:^17.1.0, @metamask/keyring-controller@npm:^17.1.1":
version: 17.1.1
resolution: "@metamask/keyring-controller@npm:17.1.1"
dependencies:
"@ethereumjs/util": "npm:^8.1.0"
"@keystonehq/metamask-airgapped-keyring": "npm:^0.14.1"
"@metamask/base-controller": "npm:^6.0.0"
"@metamask/base-controller": "npm:^6.0.1"
"@metamask/browser-passworder": "npm:^4.3.0"
"@metamask/eth-hd-keyring": "npm:^7.0.1"
"@metamask/eth-sig-util": "npm:^7.0.1"
"@metamask/eth-simple-keyring": "npm:^6.0.1"
"@metamask/keyring-api": "npm:^8.0.0"
"@metamask/message-manager": "npm:^10.0.0"
"@metamask/utils": "npm:^8.3.0"
"@metamask/message-manager": "npm:^10.0.1"
"@metamask/utils": "npm:^9.0.0"
async-mutex: "npm:^0.5.0"
ethereumjs-wallet: "npm:^1.0.1"
immer: "npm:^9.0.6"
checksum: 10/59eee1451c6bb8ea9dfee3249a49b2092464d1759ce7a0bb3c052a18c979a49d8e410bbece78d9659ecb80efb26f7cf7e3163314efc476bd39c1912bbb63b7b8
checksum: 10/441bd01b42658819281ef45ebfb214d3282db2cf523284314ca8e6786e7c06fa564a6799e506edc67153d2b51126a8aca3b67762bbb5221c382f70c81a81db29
languageName: node
linkType: hard

Expand All @@ -5711,18 +5711,18 @@ __metadata:
languageName: node
linkType: hard

"@metamask/message-manager@npm:^10.0.0":
version: 10.0.0
resolution: "@metamask/message-manager@npm:10.0.0"
"@metamask/message-manager@npm:^10.0.1":
version: 10.0.1
resolution: "@metamask/message-manager@npm:10.0.1"
dependencies:
"@metamask/base-controller": "npm:^6.0.0"
"@metamask/controller-utils": "npm:^11.0.0"
"@metamask/base-controller": "npm:^6.0.1"
"@metamask/controller-utils": "npm:^11.0.1"
"@metamask/eth-sig-util": "npm:^7.0.1"
"@metamask/utils": "npm:^8.3.0"
"@metamask/utils": "npm:^9.0.0"
"@types/uuid": "npm:^8.3.0"
jsonschema: "npm:^1.2.4"
uuid: "npm:^8.3.2"
checksum: 10/ad0d3e92693c668d6959a0ad6a7262923b892206adb22137ff002e50b1156f687afb007c6f983767e8efbb04f34e4563d6290c7240f03100731b62a8c0a55795
checksum: 10/732909c19027ceb84eec66c57d1dd37193b17394768c902562d2022cde29cfc913e959228caaf751996318edabd090029bb5d7f46dc4be16a0cb655b91172931
languageName: node
linkType: hard

Expand Down Expand Up @@ -25296,7 +25296,7 @@ __metadata:
"@metamask/gas-fee-controller": "npm:^18.0.0"
"@metamask/jazzicon": "npm:^2.0.0"
"@metamask/keyring-api": "npm:^8.0.0"
"@metamask/keyring-controller": "npm:^16.1.0"
"@metamask/keyring-controller": "npm:^17.1.1"
"@metamask/logging-controller": "npm:^3.0.1"
"@metamask/logo": "npm:^3.1.2"
"@metamask/message-manager": "npm:^7.3.0"
Expand Down

0 comments on commit ddbc44e

Please sign in to comment.