Skip to content

Commit 4f750b7

Browse files
jpurijpuri
committed
Merge branch 'personal_sign_message' of github.com:MetaMask/metamask-extension into personal_sign_message
2 parents 035b2ad + cab506c commit 4f750b7

File tree

132 files changed

+3221
-1004
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+3221
-1004
lines changed

‎.gitattributes‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,5 @@ app/_locales/** linguist-generated
2020
# yarn berry suggested .gitattributes
2121
/.yarn/releases/** binary
2222
/.yarn/plugins/** binary
23+
24+
app/*.html linguist-language=EJS

‎.storybook/test-data.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,19 @@ const state = {
369369
methods: [...Object.values(EthMethod)],
370370
type: EthAccountType.Eoa,
371371
},
372+
'b990b846-b384-4508-93d9-587461f1123e': {
373+
address: '0x71C7656EC7ab88b098defB751B7401B5f6d8976F',
374+
id: 'b990b846-b384-4508-93d9-587461f1123e',
375+
metadata: {
376+
name: 'Test Account 1',
377+
keyring: {
378+
type: 'Test Keyring',
379+
},
380+
},
381+
options: {},
382+
methods: [...Object.values(EthMethod)],
383+
type: EthAccountType.Eoa,
384+
},
372385
},
373386
selectedAccount: 'cf8dace4-9439-4bd4-b3a8-88c821c8fcb3',
374387
},

‎.vscode/extensions.json‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"recommendations": [
33
"rvest.vs-code-prettier-eslint",
4-
"streetsidesoftware.code-spell-checker"
4+
"streetsidesoftware.code-spell-checker",
5+
"DigitalBrainstem.javascript-ejs-support"
56
]
67
}

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
"cSpell.words": ["blockaid", "lavamoat"],
33
"editor.defaultFormatter": "rvest.vs-code-prettier-eslint",
44
"editor.tabSize": 2,
5+
"files.associations": {
6+
"app/*.html": "ejs"
7+
},
58
"files.trimTrailingWhitespace": true,
69
"javascript.preferences.importModuleSpecifier": "relative",
710
"json.schemas": [

‎.yarn/patches/squirrelly-npm-9.0.0-3cf710c7bb.patch‎

Lines changed: 0 additions & 13 deletions
This file was deleted.

‎app/_locales/en/messages.json‎

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/home.html‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,11 @@
33
<head>
44
<meta charset="utf-8">
55
<meta name="viewport" content="width=device-width, initial-scale=1 user-scalable=no">
6-
{{ @if (it.isTest) }}
7-
<title>MetaMask</title>
8-
{{ #elif (it.isMMI) }}
6+
<% if (it.isMMI && !it.isTest) { %>
97
<title>MetaMask Institutional</title>
10-
{{ #else }}
8+
<% } else { %>
119
<title>MetaMask</title>
12-
{{/if}}
10+
<% } %>
1311
<link rel="stylesheet" type="text/css" href="./index.css">
1412
</head>
1513
<body>

‎app/images/portfolio-stake-notification-light-mode.png‎

-18.5 KB
Binary file not shown.

‎app/images/staking-light-mode-preview.png‎

45.7 KB
Loading

‎app/notification.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
55
<meta charset="utf-8" />
66

7-
{{ @if (it.isTest) }}
7+
<% if (it.isTest) { %>
88
<title>MetaMask Dialog</title>
9-
{{ #elif (it.isMMI) }}
9+
<% } else if (it.isMMI) { %>
1010
<title>MetaMask Institutional</title>
11-
{{ #else }}
11+
<% } else { %>
1212
<title>MetaMask</title>
13-
{{/if}}
13+
<% } %>
1414

1515
<style>
1616
#app-content {

0 commit comments

Comments
 (0)