Skip to content

Commit eb54287

Browse files
committed
Merge branch 'dev' into ds-toc
2 parents 528acdf + ede3e40 commit eb54287

File tree

1,034 files changed

+10091
-5673
lines changed

Some content is hidden

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

1,034 files changed

+10091
-5673
lines changed

.all-contributorsrc

Lines changed: 74 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12260,7 +12260,8 @@
1226012260
"avatar_url": "https://avatars.githubusercontent.com/u/112751524?v=4",
1226112261
"profile": "https://github.com/Shiva-Sai-ssb",
1226212262
"contributions": [
12263-
"bug"
12263+
"bug",
12264+
"maintenance"
1226412265
]
1226512266
},
1226612267
{
@@ -12316,6 +12317,78 @@
1231612317
"contributions": [
1231712318
"maintenance"
1231812319
]
12320+
},
12321+
{
12322+
"login": "jncrabb",
12323+
"name": "jncrabb",
12324+
"avatar_url": "https://avatars.githubusercontent.com/u/27811684?v=4",
12325+
"profile": "https://github.com/jncrabb",
12326+
"contributions": [
12327+
"content"
12328+
]
12329+
},
12330+
{
12331+
"login": "bibo7086",
12332+
"name": "Saidu Sokoto",
12333+
"avatar_url": "https://avatars.githubusercontent.com/u/24389200?v=4",
12334+
"profile": "https://github.com/bibo7086",
12335+
"contributions": [
12336+
"content"
12337+
]
12338+
},
12339+
{
12340+
"login": "krishchvn",
12341+
"name": "Krishnakumar Chavan",
12342+
"avatar_url": "https://avatars.githubusercontent.com/u/58606754?v=4",
12343+
"profile": "https://github.com/krishchvn",
12344+
"contributions": [
12345+
"content"
12346+
]
12347+
},
12348+
{
12349+
"login": "0xV4L3NT1N3",
12350+
"name": "0xV4L3NT1N3",
12351+
"avatar_url": "https://avatars.githubusercontent.com/u/33112835?v=4",
12352+
"profile": "https://github.com/0xV4L3NT1N3",
12353+
"contributions": [
12354+
"tool"
12355+
]
12356+
},
12357+
{
12358+
"login": "JoshDavisLight",
12359+
"name": "Josh Davis",
12360+
"avatar_url": "https://avatars.githubusercontent.com/u/82784104?v=4",
12361+
"profile": "https://github.com/JoshDavisLight",
12362+
"contributions": [
12363+
"content"
12364+
]
12365+
},
12366+
{
12367+
"login": "tr1sm0s1n",
12368+
"name": "Mobin Mohanan",
12369+
"avatar_url": "https://avatars.githubusercontent.com/u/47410557?v=4",
12370+
"profile": "https://github.com/tr1sm0s1n",
12371+
"contributions": [
12372+
"content"
12373+
]
12374+
},
12375+
{
12376+
"login": "Baystef",
12377+
"name": "Adebayo Steve",
12378+
"avatar_url": "https://avatars.githubusercontent.com/u/36106823?v=4",
12379+
"profile": "https://github.com/Baystef",
12380+
"contributions": [
12381+
"code"
12382+
]
12383+
},
12384+
{
12385+
"login": "sanjanaynvsdl",
12386+
"name": "Sanjana",
12387+
"avatar_url": "https://avatars.githubusercontent.com/u/142678317?v=4",
12388+
"profile": "https://github.com/sanjanaynvsdl",
12389+
"contributions": [
12390+
"bug"
12391+
]
1231912392
}
1232012393
],
1232112394
"contributorsPerLine": 7,

.github/ISSUE_TEMPLATE/suggest_wallet.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ body:
264264
- type: input
265265
id: wallet_l2_support
266266
attributes:
267-
label: Does the wallet support Ethereum layer 2 networks?
267+
label: Which Ethereum Layer 2 networks does the wallet support?
268268
description: Please provide documentation on Ethereum layer 2 networks this wallet supports.
269269
validations:
270270
required: true

.github/workflows/chromatic.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ on:
1717
- "src/layouts/**/*"
1818
- "src/@chakra-ui/**/*"
1919
- ".storybook/**/*"
20+
- "tailwind.config.ts"
21+
- "src/styles/**/*"
2022

2123
# List of jobs
2224
jobs:

.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ export const ns = [
2121
"page-upgrades",
2222
"page-developers-index",
2323
"page-what-is-ethereum",
24+
"page-upgrades-index",
2425
] as const
2526
const supportedLngs = Object.keys(baseLocales)
2627

.storybook/main.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ const config: StorybookConfig = {
4747
},
4848
},
4949
webpackFinal: async (config) => {
50+
config.module = config.module || {}
51+
config.module.rules = config.module.rules || []
52+
5053
if (config.resolve) {
5154
config.resolve.plugins = [
5255
...(config.resolve.plugins || []),
@@ -55,6 +58,22 @@ const config: StorybookConfig = {
5558
}),
5659
]
5760
}
61+
62+
// This modifies the existing image rule to exclude .svg files
63+
// since you want to handle those files with @svgr/webpack
64+
const imageRule = config.module.rules.find((rule) =>
65+
rule?.["test"]?.test(".svg")
66+
)
67+
if (imageRule) {
68+
imageRule["exclude"] = /\.svg$/
69+
}
70+
71+
// Configure .svg files to be loaded with @svgr/webpack
72+
config.module.rules.push({
73+
test: /\.svg$/,
74+
use: ["@svgr/webpack"],
75+
})
76+
5877
return config
5978
},
6079
typescript: {

.storybook/preview.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ const preview: Preview = {
4242
],
4343
parameters: {
4444
i18n,
45-
actions: { argTypesRegex: "^on[A-Z].*" },
4645
controls: {
4746
matchers: {
4847
color: /(background|color)$/i,

README.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18731873
<td align="center" valign="top" width="14.28%"><a href="https://github.com/abonnaudet-ledger"><img src="https://avatars.githubusercontent.com/u/71646516?v=4?s=100" width="100px;" alt="abonnaudet-ledger"/><br /><sub><b>abonnaudet-ledger</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aabonnaudet-ledger" title="Bug reports">🐛</a></td>
18741874
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JacobSharples"><img src="https://avatars.githubusercontent.com/u/45126111?v=4?s=100" width="100px;" alt="Jacob Sharples"/><br /><sub><b>Jacob Sharples</b></sub></a><br /><a href="#content-JacobSharples" title="Content">🖋</a></td>
18751875
<td align="center" valign="top" width="14.28%"><a href="https://github.com/omahs"><img src="https://avatars.githubusercontent.com/u/73983677?v=4?s=100" width="100px;" alt="omahs"/><br /><sub><b>omahs</b></sub></a><br /><a href="#translation-omahs" title="Translation">🌍</a> <a href="#maintenance-omahs" title="Maintenance">🚧</a></td>
1876-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a></td>
1876+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Shiva-Sai-ssb"><img src="https://avatars.githubusercontent.com/u/112751524?v=4?s=100" width="100px;" alt="Shiva Sai"/><br /><sub><b>Shiva Sai</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AShiva-Sai-ssb" title="Bug reports">🐛</a> <a href="#maintenance-Shiva-Sai-ssb" title="Maintenance">🚧</a></td>
18771877
<td align="center" valign="top" width="14.28%"><a href="https://bsaurabh.xyz/"><img src="https://avatars.githubusercontent.com/u/39492927?v=4?s=100" width="100px;" alt="Saurabh Burade"/><br /><sub><b>Saurabh Burade</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=saurabhburade" title="Code">💻</a></td>
18781878
</tr>
18791879
<tr>
@@ -1882,6 +1882,16 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18821882
<td align="center" valign="top" width="14.28%"><a href="https://github.com/codingmickey"><img src="https://avatars.githubusercontent.com/u/42518907?v=4?s=100" width="100px;" alt="Kartik Jolapara"/><br /><sub><b>Kartik Jolapara</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=codingmickey" title="Code">💻</a></td>
18831883
<td align="center" valign="top" width="14.28%"><a href="https://ekam-bitt.github.io"><img src="https://avatars.githubusercontent.com/u/74407205?v=4?s=100" width="100px;" alt="Ekam Bitt"/><br /><sub><b>Ekam Bitt</b></sub></a><br /><a href="#maintenance-Ekam-Bitt" title="Maintenance">🚧</a></td>
18841884
<td align="center" valign="top" width="14.28%"><a href="http://iankguimaraes.com"><img src="https://avatars.githubusercontent.com/u/29215044?v=4?s=100" width="100px;" alt="Ian K. Guimarães"/><br /><sub><b>Ian K. Guimarães</b></sub></a><br /><a href="#maintenance-iankressin" title="Maintenance">🚧</a></td>
1885+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jncrabb"><img src="https://avatars.githubusercontent.com/u/27811684?v=4?s=100" width="100px;" alt="jncrabb"/><br /><sub><b>jncrabb</b></sub></a><br /><a href="#content-jncrabb" title="Content">🖋</a></td>
1886+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/bibo7086"><img src="https://avatars.githubusercontent.com/u/24389200?v=4?s=100" width="100px;" alt="Saidu Sokoto"/><br /><sub><b>Saidu Sokoto</b></sub></a><br /><a href="#content-bibo7086" title="Content">🖋</a></td>
1887+
</tr>
1888+
<tr>
1889+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/krishchvn"><img src="https://avatars.githubusercontent.com/u/58606754?v=4?s=100" width="100px;" alt="Krishnakumar Chavan"/><br /><sub><b>Krishnakumar Chavan</b></sub></a><br /><a href="#content-krishchvn" title="Content">🖋</a></td>
1890+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/0xV4L3NT1N3"><img src="https://avatars.githubusercontent.com/u/33112835?v=4?s=100" width="100px;" alt="0xV4L3NT1N3"/><br /><sub><b>0xV4L3NT1N3</b></sub></a><br /><a href="#tool-0xV4L3NT1N3" title="Tools">🔧</a></td>
1891+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/JoshDavisLight"><img src="https://avatars.githubusercontent.com/u/82784104?v=4?s=100" width="100px;" alt="Josh Davis"/><br /><sub><b>Josh Davis</b></sub></a><br /><a href="#content-JoshDavisLight" title="Content">🖋</a></td>
1892+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/tr1sm0s1n"><img src="https://avatars.githubusercontent.com/u/47410557?v=4?s=100" width="100px;" alt="Mobin Mohanan"/><br /><sub><b>Mobin Mohanan</b></sub></a><br /><a href="#content-tr1sm0s1n" title="Content">🖋</a></td>
1893+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Baystef"><img src="https://avatars.githubusercontent.com/u/36106823?v=4?s=100" width="100px;" alt="Adebayo Steve"/><br /><sub><b>Adebayo Steve</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=Baystef" title="Code">💻</a></td>
1894+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sanjanaynvsdl"><img src="https://avatars.githubusercontent.com/u/142678317?v=4?s=100" width="100px;" alt="Sanjana"/><br /><sub><b>Sanjana</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Asanjanaynvsdl" title="Bug reports">🐛</a></td>
18851895
</tr>
18861896
</tbody>
18871897
</table>

chromatic.config.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"projectId": "Project:6629cd26b1440f2cc20b94c0",
33
"zip": true,
4-
"buildScriptName": "build-storybook:chromatic"
4+
"buildScriptName": "build-storybook:chromatic",
5+
"onlyChanged": true
56
}

docs/best-practices.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Markdown will be translated as whole pages of content, so no specific action is
3535
```tsx
3636
<p>
3737
All Ethereum transactions require a fee, known as Gas, that gets paid to the
38-
miner. <Link to="link">More on Gas</Link>
38+
miner. <Link href="link">More on Gas</Link>
3939
</p>
4040
```
4141

@@ -44,7 +44,7 @@ Markdown will be translated as whole pages of content, so no specific action is
4444
```tsx
4545
<p>
4646
<Translation id="page-transactions" />{" "}
47-
<Link to="link">
47+
<Link href="link">
4848
<Translation id="page-transactions-gas-link" />
4949
</Link>
5050
</p>

docs/review-process.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ This documentation outlines our current processes for how we prioritize items in
66

77
### General review process
88

9-
We use a first-in, first-out system for reviewing pull requests. The longer a pull request has been open, the higher the priority it is for our team to review. In some cases—for example, fixing a high-priority issue or merging low-hanging fruit for a deploy—we will stray from this process and use our best judgement to get higher-impact changes deployed more quickly.
9+
We use a first-in, first-out system for reviewing pull requests. The longer a pull request has been open, the higher the priority it is for our team to review. In some cases—for example, fixing a high-priority issue or merging low-hanging fruit for a deploy—we will stray from this process and use our best judgment to get higher-impact changes deployed more quickly.
1010

1111
We aim to have every new PR reviewed with change requests, merged, or closed within 30 days of opening. As outlined in the following sections, different types of pull requests do have different levels of priority, and this may influence how promptly a pull request is acted on.
1212

0 commit comments

Comments
 (0)