Skip to content

Commit 878d35a

Browse files
MartinKong1990MartinKong1990
authored
Merge branch 'ethereum:dev' into devcon
2 parents 54df15c + 9163e6b commit 878d35a

File tree

16 files changed

+301
-265
lines changed

16 files changed

+301
-265
lines changed

‎src/assets/heroes/roadmap-hub-hero.jpg‎

1.3 MB
Loading

‎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/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/community/research/index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ Tools for Ethereum developers are rapidly improving. There is lots of active res
346346
- [Developer Frameworks](/developers/docs/frameworks/)
347347
- [Consensus developer tools list](https://github.com/ConsenSys/ethereum-developer-tools-list)
348348
- [Token standards](/developers/docs/standards/tokens/)
349-
- [Biastek: Ethereum tools](https://biastek.com/ethereum-tools/)
350349
- [CryptoDevHub: EVM Tools](https://cryptodevhub.io/wiki/ethereum-virtual-machine-tools)
351350

352351
#### Recent research {#recent-research-17}

‎src/content/roadmap/index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Ethereum roadmap
33
description: The path to more scalability, security and sustainability for Ethereum.
44
lang: en
55
template: roadmap
6-
image: ../../assets/roadmap/roadmap-main.png
6+
image: ../../assets/heroes/roadmap-hub-hero.jpg
77
alt: "Ethereum roadmap"
88
summaryPoints:
99
buttons:

‎src/content/translations/es/community/research/index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ Las herramientas para desarrolladores de Ethereum están evolucionando rápidame
346346
- [Entornos de desarrollo](/developers/docs/frameworks/)
347347
- [Lista de herramientas de desarrollo de consenso](https://github.com/ConsenSys/ethereum-developer-tools-list)
348348
- [Estándares de tókenes](/developers/docs/standards/tokens/)
349-
- [Biastek: Herramientas de Ethereum](https://biastek.com/ethereum-tools/)
350349
- [CryptoDevHub: Herramientas EVM](https://cryptodevhub.io/wiki/ethereum-virtual-machine-tools)
351350

352351
#### Investigaciones recientes {#recent-research-17}

‎src/content/translations/tr/community/research/index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ Ethereum geliştiricileri için araçlar hızlıca gelişiyor. Bu genel alanda y
346346
- [Geliştirici Çerçeveleri](/developers/docs/frameworks/)
347347
- [Mutabakat geliştirici araçları listesi](https://github.com/ConsenSys/ethereum-developer-tools-list)
348348
- [Token standartları](/developers/docs/standards/tokens/)
349-
- [Biastek: Ethereum araçları](https://biastek.com/ethereum-tools/)
350349
- [CryptoDevHub: EVM Araçları](https://cryptodevhub.io/wiki/ethereum-virtual-machine-tools)
351350

352351
#### Güncel araştırma {#recent-research-17}

‎src/content/translations/zh-tw/community/research/index.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -346,7 +346,6 @@ lang: zh-tw
346346
- [開發者框架](/developers/docs/frameworks/)
347347
- [共識開發者工具列表](https://github.com/ConsenSys/ethereum-developer-tools-list)
348348
- [權杖標準](/developers/docs/standards/tokens/)
349-
- [Biastek：以太坊工具](https://biastek.com/ethereum-tools/)
350349
- [CryptoDevHub：以太坊虛擬機工具](https://cryptodevhub.io/wiki/ethereum-virtual-machine-tools)
351350

352351
#### 近期研究 {#recent-research-17}

‎src/intl/en/learn-quizzes.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@
206206
"e003-c-explanation": "Prominent community members do not do ETH giveaways. Scammers pretend well-know individuals, such as Elon Musk, are doing giveaways to give them the scam a sense of legitimacy.",
207207
"e003-d-label": "Are very likely to be a scam",
208208
"e003-d-explanation": "ETH giveaways are always scams. Reporting and ignoring scammers is best.",
209-
"e004-prompt": "Ethereum transaction are reversible.",
209+
"e004-prompt": "Ethereum transactions are reversible.",
210210
"e004-a-label": "True",
211211
"e004-a-explanation": "Ethereum transactions cannot be reversed. Anyone who tells you otherwise might be trying to scam you.",
212212
"e004-b-label": "False",

0 commit comments

Comments
 (0)