Skip to content

Commit 2e13dbf

Browse files
wackerowwackerow
authored
Merge pull request #11736 from ethereum/staging
Deploy v7.24.2
2 parents 7e1aa64 + 9bbda91 commit 2e13dbf

File tree

70 files changed

+417
-181
lines changed

Some content is hidden

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

70 files changed

+417
-181
lines changed

‎.all-contributorsrc

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10830,6 +10830,42 @@
1083010830
"contributions": [
1083110831
"content"
1083210832
]
10833+
},
10834+
{
10835+
"login": "Erlangshen219",
10836+
"name": "Erlangshen219",
10837+
"avatar_url": "https://avatars.githubusercontent.com/u/104747507?v=4",
10838+
"profile": "https://github.com/Erlangshen219",
10839+
"contributions": [
10840+
"content"
10841+
]
10842+
},
10843+
{
10844+
"login": "AyDeveloper",
10845+
"name": "AyDeveloper",
10846+
"avatar_url": "https://avatars.githubusercontent.com/u/72970379?v=4",
10847+
"profile": "https://oxpampam.netlify.app/",
10848+
"contributions": [
10849+
"content"
10850+
]
10851+
},
10852+
{
10853+
"login": "jeremyfritzen",
10854+
"name": "jeremyfritzen",
10855+
"avatar_url": "https://avatars.githubusercontent.com/u/26802442?v=4",
10856+
"profile": "https://github.com/jeremyfritzen",
10857+
"contributions": [
10858+
"content"
10859+
]
10860+
},
10861+
{
10862+
"login": "fuzheng1998",
10863+
"name": "Zheng Fu",
10864+
"avatar_url": "https://avatars.githubusercontent.com/u/24203166?v=4",
10865+
"profile": "https://github.com/fuzheng1998",
10866+
"contributions": [
10867+
"code"
10868+
]
1083310869
}
1083410870
],
1083510871
"contributorsPerLine": 7,

‎README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ To use an existing function locally you don't need to do anything. Just check th
122122
To create a new function, you will need to create two files:
123123

124124
- One in `src/lambda` where the logic will live. These are the ones that will be deployed to Netlify. These functions follow [this format](https://docs.netlify.com/functions/build-with-javascript/#synchronous-function-format).
125-
- One in `src/api` that will be just a wrapper around the previous one in order to be compatible with Gatsby functions. More on the [Gatbsy docs](https://www.gatsbyjs.com/docs/reference/functions/getting-started/) for the format they follow.
125+
- One in `src/api` that will be just a wrapper around the previous one in order to be compatible with Gatsby functions. More on the [Gatsby docs](https://www.gatsbyjs.com/docs/reference/functions/getting-started/) for the format they follow.
126126

127127
Typically, you will develop and test functions in the Gatsby context, by running `yarn start`.
128128

@@ -1692,6 +1692,12 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
16921692
<td align="center" valign="top" width="14.28%"><a href="https://github.com/konstantinzolotarev"><img src="https://avatars.githubusercontent.com/u/286431?v=4?s=100" width="100px;" alt="Konstantin Zolotarev"/><br /><sub><b>Konstantin Zolotarev</b></sub></a><br /><a href="#content-konstantinzolotarev" title="Content">🖋</a></td>
16931693
<td align="center" valign="top" width="14.28%"><a href="https://github.com/vuittont60"><img src="https://avatars.githubusercontent.com/u/81072379?v=4?s=100" width="100px;" alt="vuittont60"/><br /><sub><b>vuittont60</b></sub></a><br /><a href="#content-vuittont60" title="Content">🖋</a></td>
16941694
<td align="center" valign="top" width="14.28%"><a href="http://goldnite.github.io"><img src="https://avatars.githubusercontent.com/u/114434414?v=4?s=100" width="100px;" alt="Golden Ite"/><br /><sub><b>Golden Ite</b></sub></a><br /><a href="#content-goldnite" title="Content">🖋</a></td>
1695+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Erlangshen219"><img src="https://avatars.githubusercontent.com/u/104747507?v=4?s=100" width="100px;" alt="Erlangshen219"/><br /><sub><b>Erlangshen219</b></sub></a><br /><a href="#content-Erlangshen219" title="Content">🖋</a></td>
1696+
<td align="center" valign="top" width="14.28%"><a href="https://oxpampam.netlify.app/"><img src="https://avatars.githubusercontent.com/u/72970379?v=4?s=100" width="100px;" alt="AyDeveloper"/><br /><sub><b>AyDeveloper</b></sub></a><br /><a href="#content-AyDeveloper" title="Content">🖋</a></td>
1697+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/jeremyfritzen"><img src="https://avatars.githubusercontent.com/u/26802442?v=4?s=100" width="100px;" alt="jeremyfritzen"/><br /><sub><b>jeremyfritzen</b></sub></a><br /><a href="#content-jeremyfritzen" title="Content">🖋</a></td>
1698+
</tr>
1699+
<tr>
1700+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/fuzheng1998"><img src="https://avatars.githubusercontent.com/u/24203166?v=4?s=100" width="100px;" alt="Zheng Fu"/><br /><sub><b>Zheng Fu</b></sub></a><br /><a href="https://github.com/ethereum/ethereum-org-website/commits?author=fuzheng1998" title="Code">💻</a></td>
16951701
</tr>
16961702
</tbody>
16971703
</table>

‎src/@chakra-ui/gatsby-plugin/semanticTokens.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@ const semanticTokens = {
9292
_dark: "whiteAlpha.400",
9393
},
9494
switchBackground: { _light: "gray.300", _dark: "whiteAlpha.400" },
95+
hubHeroContentBg: {
96+
_light: "rgba(255, 255, 255, 0.80)",
97+
_dark: "rgba(34, 34, 34, 0.80)",
98+
},
9599
},
96100
gradients: {
97101
bgMainGradient: {

‎src/components/Buttons/Button.tsx

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import {
66
} from "@chakra-ui/react"
77

88
import { scrollIntoView } from "../../utils/scrollIntoView"
9+
import { type MatomoEventOptions, trackCustomEvent } from "../../utils/matomo"
910

1011
export const checkIsSecondary = (props: {
1112
variant?: string
@@ -33,15 +34,15 @@ export interface IProps extends ButtonProps {
3334
* `NOTE`: Does not apply to the `Solid` or `Link` variants
3435
*/
3536
isSecondary?: boolean
37+
customEventOptions?: MatomoEventOptions
3638
}
3739

3840
const Button = forwardRef<IProps, "button">((props, ref) => {
39-
const { toId, onClick, isSecondary, ...rest } = props
41+
const { toId, onClick, isSecondary, customEventOptions, ...rest } = props
4042

4143
const handleOnClick = (e: React.MouseEvent<HTMLButtonElement>) => {
42-
if (toId) {
43-
scrollIntoView(toId)
44-
}
44+
toId && scrollIntoView(toId)
45+
customEventOptions && trackCustomEvent(customEventOptions)
4546

4647
onClick?.(e)
4748
}

‎src/components/FindWallet/WalletTable/index.tsx

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -427,11 +427,13 @@ const WalletTable = ({ data, filters, walletData }: WalletTableProps) => {
427427
<Wallet
428428
onClick={() => {
429429
updateMoreInfo(wallet.key)
430-
trackCustomEvent({
431-
eventCategory: "WalletMoreInfo",
432-
eventAction: `More info wallet`,
433-
eventName: `More info ${wallet.name} ${wallet.moreInfo}`,
434-
})
430+
// Log "more info" event only on expanding
431+
wallet.moreInfo &&
432+
trackCustomEvent({
433+
eventCategory: "WalletMoreInfo",
434+
eventAction: `More info wallet`,
435+
eventName: `More info ${wallet.name}`,
436+
})
435437
}}
436438
>
437439
<Td lineHeight="revert">
@@ -473,7 +475,7 @@ const WalletTable = ({ data, filters, walletData }: WalletTableProps) => {
473475
customEventOptions={{
474476
eventCategory: "WalletExternalLinkList",
475477
eventAction: `Go to wallet`,
476-
eventName: `${wallet.name} ${idx}`,
478+
eventName: `Website: ${wallet.name} ${idx}`,
477479
eventValue: JSON.stringify(filters),
478480
}}
479481
>
@@ -486,7 +488,7 @@ const WalletTable = ({ data, filters, walletData }: WalletTableProps) => {
486488
customEventOptions={{
487489
eventCategory: "WalletExternalLinkList",
488490
eventAction: `Go to wallet`,
489-
eventName: `${wallet.name} ${idx}`,
491+
eventName: `Twitter: ${wallet.name} ${idx}`,
490492
eventValue: JSON.stringify(filters),
491493
}}
492494
>
@@ -504,7 +506,7 @@ const WalletTable = ({ data, filters, walletData }: WalletTableProps) => {
504506
customEventOptions={{
505507
eventCategory: "WalletExternalLinkList",
506508
eventAction: `Go to wallet`,
507-
eventName: `${wallet.name} ${idx}`,
509+
eventName: `Discord: ${wallet.name} ${idx}`,
508510
eventValue: JSON.stringify(filters),
509511
}}
510512
>

‎src/components/Hero/HubHero/index.tsx

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,5 @@
11
import * as React from "react"
2-
import {
3-
Box,
4-
Heading,
5-
HStack,
6-
Stack,
7-
Text,
8-
useColorModeValue,
9-
} from "@chakra-ui/react"
2+
import { Box, Heading, HStack, Stack, Text } from "@chakra-ui/react"
103
import GatsbyImage from "../../GatsbyImage"
114
import { CallToAction } from "../CallToAction"
125
import { CommonHeroProps } from "../utils"
@@ -22,11 +15,6 @@ const HubHero = (props: HubHeroProps) => {
2215
)
2316
}
2417

25-
const largeContentBg = useColorModeValue(
26-
"rgba(255, 255, 255, 0.80)",
27-
"rgba(34, 34, 34, 0.80)"
28-
)
29-
3018
return (
3119
<Box position="relative">
3220
<GatsbyImage
@@ -47,7 +35,7 @@ const HubHero = (props: HubHeroProps) => {
4735
p={{ base: "4", lg: "8" }}
4836
textAlign={{ base: "center", xl: "start" }}
4937
borderRadius={{ xl: "base" }}
50-
bg={{ xl: largeContentBg }}
38+
bg={{ xl: "hubHeroContentBg" }}
5139
position={{ xl: "absolute" }}
5240
insetStart={{ xl: "8" }}
5341
maxW={{ xl: "sm" }}

‎src/components/LeftNavBar/index.tsx

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ const LeftNavBar: React.FC<IProps> = ({
5151
position="sticky"
5252
top="6.25rem"
5353
height={calc("100vh").subtract("80px").toString()}
54+
zIndex="dropdown"
5455
{...props}
5556
>
5657
{dropdownLinks && <StyledButtonDropdown list={dropdownLinks} />}

‎src/components/TranslationLeaderboard.tsx

Lines changed: 36 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,36 @@ const RadioCard = (props) => {
8484
)
8585
}
8686

87+
const filterLeaderboardUsers = (item) => {
88+
const username = item.user.username.toLowerCase()
89+
const fullName = item.user.fullName?.toLowerCase() || ""
90+
91+
const excludedUsernames = new Set([
92+
"ethdotorg",
93+
"finnish_sandberg",
94+
"norwegian_sandberg",
95+
"swedish_sandberg",
96+
])
97+
98+
return (
99+
!excludedUsernames.has(username) &&
100+
!username.includes("lqs_") &&
101+
!username.includes("removed_user") &&
102+
!username.includes("aco_") &&
103+
!fullName.includes("aco_") &&
104+
!username.includes("aco-") &&
105+
!fullName.includes("aco-") &&
106+
!username.includes("acc_") &&
107+
!fullName.includes("acc_")
108+
)
109+
}
110+
111+
const sortAndFilterData = (data) => {
112+
return reverse(sortBy(data, ({ user }) => user.totalCosts)).filter(
113+
filterLeaderboardUsers
114+
)
115+
}
116+
87117
const TranslationLeaderboard: React.FC<IProps> = ({
88118
monthData,
89119
quarterData,
@@ -94,15 +124,13 @@ const TranslationLeaderboard: React.FC<IProps> = ({
94124
"tableItemBox.light",
95125
"tableItemBox.dark"
96126
)
127+
97128
const leaderboardData = {
98-
monthData: reverse(sortBy(monthData.data, ({ user }) => user.totalCosts)),
99-
quarterData: reverse(
100-
sortBy(quarterData.data, ({ user }) => user.totalCosts)
101-
),
102-
allTimeData: reverse(
103-
sortBy(allTimeData.data, ({ user }) => user.totalCosts)
104-
),
129+
monthData: sortAndFilterData(monthData.data),
130+
quarterData: sortAndFilterData(quarterData.data),
131+
allTimeData: sortAndFilterData(allTimeData.data),
105132
}
133+
106134
const [filterAmount, updateFilterAmount] = useState(10)
107135
const [dateRangeType, updateDateRangeType] = useState("monthData")
108136

@@ -174,22 +202,8 @@ const TranslationLeaderboard: React.FC<IProps> = ({
174202
<Translation id="page-contributing-translation-program-acknowledgements-total-words" />
175203
</Flex>
176204
</Flex>
177-
{/* // TODO: Remove specific user checks once Acolad has updated their usernames */}
178205
{leaderboardData[dateRangeType]
179-
.filter(
180-
(item) =>
181-
item.user.username !== "ethdotorg" &&
182-
!item.user.username.includes("LQS_") &&
183-
!item.user.username.includes("REMOVED_USER") &&
184-
!item.user.username.includes("Aco_") &&
185-
!item.user.fullName.includes("Aco_") &&
186-
!item.user.username.includes("Acc_") &&
187-
!item.user.fullName.includes("Acc_") &&
188-
item.user.username !== "Finnish_Sandberg" &&
189-
item.user.username !== "Norwegian_Sandberg" &&
190-
item.user.username !== "Swedish_Sandberg"
191-
)
192-
.filter((item, idx) => idx < filterAmount)
206+
.slice(0, filterAmount)
193207
.map((item, idx) => {
194208
const { user, languages } = item
195209
const sortedLanguages = reverse(

‎src/content/contributing/translation-program/content-buckets/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ Below is a breakdown of the website pages each content bucket contains.
296296
- [Interact with other contracts from Solidity](/developers/tutorials/interact-with-other-contracts-from-solidity/)
297297
- [NFT Minter tutorial](/developers/tutorials/nft-minter/)
298298
- [Reverse engineering a contract](/developers/tutorials/reverse-engineering-a-contract/)
299-
- [Sending tokens using ethers.js](/developers/tutorials/send-token-etherjs/)
299+
- [Sending tokens using ethers.js](/developers/tutorials/send-token-ethersjs/)
300300
- [The Graph: Fixing Web3 data querying](/developers/tutorials/the-graph-fixing-web3-data-querying/)
301301
- [Transfers and approval of ERC-20 tokens from a Solidity smart contract](/developers/tutorials/transfers-and-approval-of-erc-20-tokens-from-a-solidity-smart-contract/)
302302

@@ -308,7 +308,7 @@ Below is a breakdown of the website pages each content bucket contains.
308308
- [ERC-20 with safety rails](/developers/tutorials/erc20-with-safety-rails/)
309309
- [Getting Started with Ethereum Development](/developers/tutorials/getting-started-with-ethereum-development-using-alchemy/)
310310
- [How to mock Solidity smart contracts for testing](/developers/tutorials/how-to-mock-solidity-contracts-for-testing/)
311-
- [Kickstart your dapp frontend development with create-eth-app](/developers/tutorials/kickstart-your-dapp-frontend-development-wth-create-eth-app/)
311+
- [Kickstart your dapp frontend development with create-eth-app](/developers/tutorials/kickstart-your-dapp-frontend-development-with-create-eth-app/)
312312
- [Logging data from smart contracts with events](/developers/tutorials/logging-events-smart-contracts/)
313313
- [Merkle proofs for offline data integrity](/developers/tutorials/merkle-proofs-for-offline-data-integrity/)
314314
- [Sending transactions using Web3](/developers/tutorials/sending-transactions-using-web3-and-alchemy/)

‎src/content/developers/docs/apis/json-rpc/index.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,8 @@ params: [
926926
gas: "0x76c0", // 30400
927927
gasPrice: "0x9184e72a000", // 10000000000000
928928
value: "0x9184e72a", // 2441406250
929-
input: "0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675",
929+
input:
930+
"0xd46e8dd67c5d32be8d46e8dd67c5d32be8058bb8eb970870f072445675058bb8eb970870f072445675",
930931
},
931932
]
932933
```

0 commit comments

Comments
 (0)