Skip to content

Commit ee4a4af

Browse files
Merge branch 'dev' into redesign-events-page
2 parents 30a08ef + 62238f3 commit ee4a4af

File tree

870 files changed

+5927
-3715
lines changed

Some content is hidden

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

870 files changed

+5927
-3715
lines changed

.all-contributorsrc

Lines changed: 67 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11320,7 +11320,8 @@
1132011320
"avatar_url": "https://avatars.githubusercontent.com/u/71248977?v=4",
1132111321
"profile": "https://github.com/UNOFFICIALbgd",
1132211322
"contributions": [
11323-
"bug"
11323+
"bug",
11324+
"doc"
1132411325
]
1132511326
},
1132611327
{
@@ -12249,7 +12250,8 @@
1224912250
"avatar_url": "https://avatars.githubusercontent.com/u/73983677?v=4",
1225012251
"profile": "https://github.com/omahs",
1225112252
"contributions": [
12252-
"translation"
12253+
"translation",
12254+
"maintenance"
1225312255
]
1225412256
},
1225512257
{
@@ -12278,6 +12280,69 @@
1227812280
"contributions": [
1227912281
"content"
1228012282
]
12283+
},
12284+
{
12285+
"login": "sandeepV2",
12286+
"name": "Sandeep Belagavi",
12287+
"avatar_url": "https://avatars.githubusercontent.com/u/52043035?v=4",
12288+
"profile": "https://github.com/sandeepV2",
12289+
"contributions": [
12290+
"bug"
12291+
]
12292+
},
12293+
{
12294+
"login": "codingmickey",
12295+
"name": "Kartik Jolapara",
12296+
"avatar_url": "https://avatars.githubusercontent.com/u/42518907?v=4",
12297+
"profile": "https://github.com/codingmickey",
12298+
"contributions": [
12299+
"code"
12300+
]
12301+
},
12302+
{
12303+
"login": "Ekam-Bitt",
12304+
"name": "Ekam Bitt",
12305+
"avatar_url": "https://avatars.githubusercontent.com/u/74407205?v=4",
12306+
"profile": "https://ekam-bitt.github.io",
12307+
"contributions": [
12308+
"maintenance"
12309+
]
12310+
},
12311+
{
12312+
"login": "iankressin",
12313+
"name": "Ian K. Guimarães",
12314+
"avatar_url": "https://avatars.githubusercontent.com/u/29215044?v=4",
12315+
"profile": "http://iankguimaraes.com",
12316+
"contributions": [
12317+
"maintenance"
12318+
]
12319+
},
12320+
{
12321+
"login": "jncrabb",
12322+
"name": "jncrabb",
12323+
"avatar_url": "https://avatars.githubusercontent.com/u/27811684?v=4",
12324+
"profile": "https://github.com/jncrabb",
12325+
"contributions": [
12326+
"content"
12327+
]
12328+
},
12329+
{
12330+
"login": "bibo7086",
12331+
"name": "Saidu Sokoto",
12332+
"avatar_url": "https://avatars.githubusercontent.com/u/24389200?v=4",
12333+
"profile": "https://github.com/bibo7086",
12334+
"contributions": [
12335+
"content"
12336+
]
12337+
},
12338+
{
12339+
"login": "krishchvn",
12340+
"name": "Krishnakumar Chavan",
12341+
"avatar_url": "https://avatars.githubusercontent.com/u/58606754?v=4",
12342+
"profile": "https://github.com/krishchvn",
12343+
"contributions": [
12344+
"content"
12345+
]
1228112346
}
1228212347
],
1228312348
"contributorsPerLine": 7,

.env.example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@
1616
# GOOGLE_API_KEY=
1717
# GOOGLE_CALENDAR_ID=
1818

19+
# Dune Analytics API key (required for total eth staked)
20+
# DUNE_API_KEY=
21+
1922
# Matomo environment (URL and site ID required for analytics)
2023
NEXT_PUBLIC_MATOMO_URL=
2124
NEXT_PUBLIC_MATOMO_SITE_ID=

.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:

.lintstagedrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ const buildEslintCommand = (filenames) =>
55
.map((f) => path.relative(process.cwd(), f))
66
.join(" --file ")}`
77

8+
const formatCommand = "prettier --write"
9+
810
module.exports = {
9-
"*.{js,jsx,ts,tsx}": [buildEslintCommand],
11+
"*.{js,jsx,ts,tsx}": [buildEslintCommand, formatCommand],
1012
}

.storybook/main.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ const config: StorybookConfig = {
2525
{
2626
name: "@storybook/addon-essentials",
2727
options: {
28-
backgrounds: false
29-
}
28+
backgrounds: false,
29+
},
3030
},
3131
"@storybook/addon-interactions",
3232
"storybook-react-i18next",
3333
"@storybook/addon-themes",
34-
"@chromatic-com/storybook"
34+
"@chromatic-com/storybook",
3535
],
3636
staticDirs: ["../public"],
3737
framework: {
@@ -79,7 +79,7 @@ const config: StorybookConfig = {
7979
},
8080
},
8181

82-
reactDocgen: "react-docgen-typescript"
82+
reactDocgen: "react-docgen-typescript",
8383
},
8484
}
8585
export default config

.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,

.storybook/types.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import type { ArgTypes } from "@storybook/react"
1111
type KeyOf<T> = [T] extends [never]
1212
? never
1313
: T extends object
14-
? Extract<keyof T, string>
15-
: never
14+
? Extract<keyof T, string>
15+
: never
1616

1717
export type ThemingArgTypeKey = "variant" | "size"
1818

@@ -49,8 +49,10 @@ export type ThemingArgTypeKey = "variant" | "size"
4949
* @param componentName component name to create the ArgTypes for
5050
*/
5151
export function getThemingArgTypes<
52-
Theme extends Record<string, unknown> & { components?: Record<string, StyleConfig> },
53-
ComponentName extends KeyOf<Theme["components"]>
52+
Theme extends Record<string, unknown> & {
53+
components?: Record<string, StyleConfig>
54+
},
55+
ComponentName extends KeyOf<Theme["components"]>,
5456
>(theme: Theme, componentName: ComponentName) {
5557
const component = theme.components?.[componentName]
5658
if (!component) {

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1742,7 +1742,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
17421742
<td align="center" valign="top" width="14.28%"><a href="https://dwyer.co.za"><img src="https://avatars.githubusercontent.com/u/2641205?v=4?s=100" width="100px;" alt="Gareth Dwyer"/><br /><sub><b>Gareth Dwyer</b></sub></a><br /><a href="#ideas-sixhobbits" title="Ideas, Planning, & Feedback">🤔</a></td>
17431743
</tr>
17441744
<tr>
1745-
<td align="center" valign="top" width="14.28%"><a href="https://github.com/UNOFFICIALbgd"><img src="https://avatars.githubusercontent.com/u/71248977?v=4?s=100" width="100px;" alt="UNOFFICIALbgd"/><br /><sub><b>UNOFFICIALbgd</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AUNOFFICIALbgd" title="Bug reports">🐛</a></td>
1745+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/UNOFFICIALbgd"><img src="https://avatars.githubusercontent.com/u/71248977?v=4?s=100" width="100px;" alt="UNOFFICIALbgd"/><br /><sub><b>UNOFFICIALbgd</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AUNOFFICIALbgd" title="Bug reports">🐛</a> <a href="https://github.com/ethereum/ethereum-org-website/commits?author=UNOFFICIALbgd" title="Documentation">📖</a></td>
17461746
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Codex-Bugmenot"><img src="https://avatars.githubusercontent.com/u/59927099?v=4?s=100" width="100px;" alt="Codex-Bugmenot"/><br /><sub><b>Codex-Bugmenot</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3ACodex-Bugmenot" title="Bug reports">🐛</a></td>
17471747
<td align="center" valign="top" width="14.28%"><a href="http://huangyongjin.com"><img src="https://avatars.githubusercontent.com/u/20609724?v=4?s=100" width="100px;" alt="Jason Huang"/><br /><sub><b>Jason Huang</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Adoutv" title="Bug reports">🐛</a></td>
17481748
<td align="center" valign="top" width="14.28%"><a href="https://github.com/adeolu98"><img src="https://avatars.githubusercontent.com/u/39372980?v=4?s=100" width="100px;" alt="dCRYPT"/><br /><sub><b>dCRYPT</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3Aadeolu98" title="Bug reports">🐛</a></td>
@@ -1872,12 +1872,21 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
18721872
<td align="center" valign="top" width="14.28%"><a href="https://github.com/pglekshmi"><img src="https://avatars.githubusercontent.com/u/107828565?v=4?s=100" width="100px;" alt="pglekshmi"/><br /><sub><b>pglekshmi</b></sub></a><br /><a href="#maintenance-pglekshmi" title="Maintenance">🚧</a></td>
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>
1875-
<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></td>
1875+
<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>
18761876
<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>
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>
18801880
<td align="center" valign="top" width="14.28%"><a href="https://github.com/yorkerhodes3"><img src="https://avatars.githubusercontent.com/u/17415717?v=4?s=100" width="100px;" alt="Yorke E. Rhodes III"/><br /><sub><b>Yorke E. Rhodes III</b></sub></a><br /><a href="#content-yorkerhodes3" title="Content">🖋</a></td>
1881+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/sandeepV2"><img src="https://avatars.githubusercontent.com/u/52043035?v=4?s=100" width="100px;" alt="Sandeep Belagavi"/><br /><sub><b>Sandeep Belagavi</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AsandeepV2" title="Bug reports">🐛</a></td>
1882+
<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>
1883+
<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>
1884+
<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>
18811890
</tr>
18821891
</tbody>
18831892
</table>

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)