Skip to content

Commit 35874e5

Browse files
alexandratranalexandratran
committed
Merge branch 'main' into 1566-multichain
# Conflicts: # docs/whats-new.md
2 parents 7a6a8e0 + 89deeb0 commit 35874e5

File tree

496 files changed

+13602
-5706
lines changed

Some content is hidden

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

496 files changed

+13602
-5706
lines changed

‎.github/workflows/security-code-scanner.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
name: 'MetaMask Security Code Scanner'
1+
name: MetaMask Security Code Scanner
22

33
on:
44
push:
55
branches:
6-
- 'main'
6+
- main
77
pull_request:
88
branches:
9-
- 'main'
9+
- main
10+
workflow_dispatch:
1011

1112
jobs:
1213
run-security-scan:

‎.prettierrc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"arrowParens": "avoid",
3+
"bracketSpacing": true,
4+
"bracketSameLine": true,
5+
"useTabs": false,
6+
"semi": false,
7+
"singleQuote": true,
8+
"tabWidth": 2,
9+
"trailingComma": "es5",
10+
"proseWrap": "never",
11+
"printWidth": 100,
12+
"htmlWhitespaceSensitivity": "css",
13+
"vueIndentScriptAndStyle": true
14+
}

‎.vscode/settings.json‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,30 @@
11
{
22
"eslint.format.enable": true,
33
"editor.codeActionsOnSave": {
4-
"source.fixAll.eslint": "explicit"
4+
"source.fixAll.eslint": "explicit",
5+
"source.fixAll.stylelint": "explicit",
6+
"source.organizeImports": "never"
57
},
68
"eslint.codeActionsOnSave.mode": "all",
79
"editor.tabSize": 2,
810
"typescript.tsdk": "node_modules/typescript/lib",
9-
"typescript.preferences.importModuleSpecifier": "non-relative"
11+
"typescript.preferences.importModuleSpecifier": "non-relative",
12+
"editor.formatOnSave": true,
13+
"editor.defaultFormatter": "esbenp.prettier-vscode",
14+
"[scss]": {
15+
"editor.defaultFormatter": "esbenp.prettier-vscode"
16+
},
17+
"javascript.format.insertSpaceAfterConstructor": false,
18+
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
19+
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
20+
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
21+
"javascript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
22+
"javascript.format.insertSpaceBeforeFunctionParenthesis": false,
23+
"typescript.format.insertSpaceAfterConstructor": false,
24+
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces": false,
25+
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets": false,
26+
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces": false,
27+
"typescript.format.insertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis": false,
28+
"typescript.format.insertSpaceBeforeFunctionParenthesis": false,
29+
"stylelint.validate": ["css", "scss", "sass"]
1030
}

‎developer-tools/dashboard/how-to/network-status.md‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,6 @@ scheduled maintenance notices. You can also subscribe to status updates via emai
1010

1111
You can also select the **Status** link on the left of the MetaMask Developer dashboard to view the status page.
1212

13-
<div class="left-align-container">
14-
<div class="img-medium">
15-
<img
16-
src={require("../../images/status-page.png").default}
17-
/>
18-
</div>
19-
</div>
13+
<p align="center">
14+
<img src={require("../../images/status-page.png").default} />
15+
</p>

‎developer-tools/dashboard/how-to/secure-an-api/set-rate-limits.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Set rate limiting in the API key's **Settings** tab **Key Credit Limits** sectio
2525
- **Per day total credits** restricts total daily credit usage for the API key. Set a limit on number of
2626
credits per day in integers, for example, 20000. The value `0` means default limits are applied.
2727

28-
When the number of used credits reach this limit, all requests will be rejected until the next day (00:00 UTC).
28+
When the number of used credits reaches this limit, all requests will be rejected until the next day (00:00 UTC).
2929

3030
If you exceed the specified limits, you'll receive a JSON response with an
3131
[HTTP error status code `429`](/services/reference/ethereum/json-rpc-methods#http-errors). For example:
@@ -41,4 +41,4 @@ If you exceed the specified limits, you'll receive a JSON response with an
4141
"details": "You have surpassed your user-defined key throughput limit setting. To make more requests with this key, review key setting configurations."
4242
}
4343
}
44-
```
44+
```

‎developer-tools/dashboard/how-to/secure-an-api/use-an-allowlist.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ The following RPC methods take an Ethereum address parameter and are compatible
5454
#### Example request
5555

5656
To allow a specific Ethereum address, input it into the **Contract Addresses** field and select **Add**.
57-
In the following example we'll use `0xfe05a3e72235c9f92fd9f2282f41a8154`.
57+
In the following example we'll use `0xfe05a3e72235c9f92fd9f2282f41a8154d6d342b`.
5858

5959
<div class="left-align-container">
6060
<div class="img-medium">

‎developer-tools/dashboard/how-to/two-factor-authentication.md‎

Lines changed: 14 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -14,41 +14,26 @@ identity before you can access your accounts.
1414
To enable 2FA authentication on your account, on the dashboard go to **Settings** -> **Account**, and
1515
select **Enable**.
1616

17-
<div class="left-align-container">
18-
<div class="img-large">
19-
<img
20-
src={require("../../images/enable2fa.png").default}
21-
/>
22-
</div>
23-
</div>
17+
<img src={require("../../images/enable2fa.png").default} />
2418

2519
Scan the QR code with your authenticator, and enter the initial six-digit token. Select **Verify** to proceed.
2620

27-
<div class="left-align-container">
28-
<div class="img-medium">
29-
<img
30-
src={require("../../images/enter_token.png").default}
31-
/>
32-
</div>
33-
</div>
21+
<p align="center">
22+
<img src={require("../../images/enter_token.png").default} />
23+
</p>
3424

35-
:::warning
36-
37-
**Save your backup code to a secure location**
25+
:::warning Important
3826

27+
**Save your backup code to a secure location.**
3928
If you ever lose access to your device, you can use this code to verify your identity.
4029

4130
:::
4231

4332
Select **Continue** to finish the process.
4433

45-
<div class="left-align-container">
46-
<div class="img-medium">
47-
<img
48-
src={require("../../images/backup_code.png").default}
49-
/>
50-
</div>
51-
</div>
34+
<p align="center">
35+
<img src={require("../../images/backup_code.png").default} />
36+
</p>
5237

5338
:::info
5439

@@ -63,35 +48,24 @@ Next time you log in to Infura, you'll be asked for your 2FA token in addition t
6348

6449
To disable 2FA on your account, on the dashboard go to **Settings** -> **Account**, and select **Disable 2FA**.
6550

66-
<div class="left-align-container">
67-
<div class="img-medium">
68-
<img
69-
src={require("../../images/disable2fa.png").default}
70-
/>
71-
</div>
72-
</div>
51+
<img src={require("../../images/disable2fa.png").default} />
7352

7453
## Lost your 2FA device?
7554

7655
If you lose your 2FA device, you can still log in using your backup code. Alternatively, you can recover your account by raising a support request with Infura.
7756

78-
:::warning
57+
:::warning Important
7958

8059
**Keep your backup code safe!**
81-
8260
If you raise a support request to recover your account, Infura support must confirm that you're the owner of the account.
8361

8462
:::
8563

8664
To log in without a 2FA device, log in to Infura with your username and password, and when confronted with the 2FA screen, select **Backup Code.** If you can't find it, your only option is to select **Recover your Account** and open a support case.
8765

88-
<div class="left-align-container">
89-
<div class="img-small">
90-
<img
91-
src={require("../../images/login2FA.png").default}
92-
/>
93-
</div>
94-
</div>
66+
<p align="center">
67+
<img src={require("../../images/login2FA.png").default} />
68+
</p>
9569

9670
:::info
9771

‎developer-tools/dashboard/how-to/upgrade-your-plan.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Infura implements the following restrictions on the number of API keys you can h
1313
- Developer plan - Allows up to five API keys.
1414
- Team plans and higher - No limit on the number of API keys.
1515

16-
For more information, see to the [Infura pricing page](https://www.infura.io/pricing).
16+
For more information, see the [Infura pricing page](https://www.infura.io/pricing).
1717

1818
:::
1919

@@ -30,4 +30,4 @@ appropriate plan, and select **Update plan**.
3030

3131
:::note
3232
If upgrading from the Core (free) plan, you'll need to add your payment details.
33-
:::
33+
:::

‎docs/whats-new.md‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,15 @@ The latest major MetaMask documentation updates are listed by the month they wer
99
For a comprehensive list of recent product changes, visit the "Release Notes" section at the bottom
1010
of the [MetaMask developer page](https://metamask.io/developer/).
1111

12-
## February 2025
12+
## March 2025
1313

1414
- Documented Multichain API [guide](/wallet/how-to/manage-networks/use-multichain),
1515
[concept](/wallet/concepts/multichain-api), and [reference](/wallet/reference/multichain-api).
1616
([#1621](https://github.com/MetaMask/metamask-docs/pull/1621))
17-
- Documented [Unichain Mainnet](/services/reference/unichain) support.([#1878](https://github.com/MetaMask/metamask-docs/pull/1878))
17+
18+
## February 2025
19+
20+
- Documented [Unichain Mainnet](/services/reference/unichain) support. ([#1878](https://github.com/MetaMask/metamask-docs/pull/1878))
1821

1922
## January 2025
2023

0 commit comments

Comments
 (0)