Skip to content

Commit 1b866d6

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into migrate/contributors
2 parents 4b98aa4 + f08e001 commit 1b866d6

File tree

10 files changed

+60
-18
lines changed

10 files changed

+60
-18
lines changed

.all-contributorsrc

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12524,6 +12524,16 @@
1252412524
"contributions": [
1252512525
"content"
1252612526
]
12527+
},
12528+
{
12529+
"login": "MaryNfs",
12530+
"name": "MaryNfs",
12531+
"avatar_url": "https://avatars.githubusercontent.com/u/52598322?v=4",
12532+
"profile": "https://github.com/MaryNfs",
12533+
"contributions": [
12534+
"content",
12535+
"bug"
12536+
]
1252712537
}
1252812538
],
1252912539
"contributorsPerLine": 7,

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1914,6 +1914,9 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
19141914
<td align="center" valign="top" width="14.28%"><a href="https://preetjdp.dev/"><img src="https://avatars.githubusercontent.com/u/27439197?v=4?s=100" width="100px;" alt="Preet Parekh"/><br /><sub><b>Preet Parekh</b></sub></a><br /><a href="#content-preetjdp" title="Content">🖋</a></td>
19151915
<td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/adamdomurad/"><img src="https://avatars.githubusercontent.com/u/163993?v=4?s=100" width="100px;" alt="ludamad"/><br /><sub><b>ludamad</b></sub></a><br /><a href="#content-ludamad" title="Content">🖋</a></td>
19161916
</tr>
1917+
<tr>
1918+
<td align="center" valign="top" width="14.28%"><a href="https://github.com/MaryNfs"><img src="https://avatars.githubusercontent.com/u/52598322?v=4?s=100" width="100px;" alt="MaryNfs"/><br /><sub><b>MaryNfs</b></sub></a><br /><a href="#content-MaryNfs" title="Content">🖋</a> <a href="https://github.com/ethereum/ethereum-org-website/issues?q=author%3AMaryNfs" title="Bug reports">🐛</a></td>
1919+
</tr>
19171920
</tbody>
19181921
</table>
19191922

public/content/developers/docs/apis/json-rpc/index.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ curl -X POST --data '{"jsonrpc":"2.0","method":"eth_syncing","params":[],"id":1}
387387

388388
Returns the client coinbase address.
389389

390+
> **Note:** This method has been deprecated as of **v1.14.0** and is no longer supported. Attempting to use this method will result in a "Method not supported" error.
391+
390392
**Parameters**
391393

392394
None
@@ -1671,10 +1673,10 @@ geth --http --dev console 2>>geth.log
16711673
16721674
This will start the HTTP RPC interface on `http://localhost:8545`.
16731675

1674-
We can verify that the interface is running by retrieving the Coinbase address and balance using [curl](https://curl.se). Please note that data in these examples will differ on your local node. If you want to try these commands, replace the request params in the second curl request with the result returned from the first.
1676+
We can verify that the interface is running by retrieving the coinbase address (by obtaining the first address from the array of accounts) and balance using [curl](https://curl.se). Please note that data in these examples will differ on your local node. If you want to try these commands, replace the request params in the second curl request with the result returned from the first.
16751677

16761678
```bash
1677-
curl --data '{"jsonrpc":"2.0","method":"eth_coinbase", "id":1}' -H "Content-Type: application/json" localhost:8545
1679+
curl --data '{"jsonrpc":"2.0","method":"eth_accounts","params":[]", "id":1}' -H "Content-Type: application/json" localhost:8545
16781680
{"id":1,"jsonrpc":"2.0","result":["0x9b1d35635cc34752ca54713bb99d38614f63c955"]}
16791681
16801682
curl --data '{"jsonrpc":"2.0","method":"eth_getBalance", "params": ["0x9b1d35635cc34752ca54713bb99d38614f63c955", "latest"], "id":2}' -H "Content-Type: application/json" localhost:8545

src/components/EventCard.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ const EventCard: React.FC<EventCardProps> = ({
5959
<h3 className="text-xl font-bold md:text-2xl">{title}</h3>
6060
<span className="text-sm opacity-60">{location}</span>
6161
</div>
62-
<p className="md:text-sm md:leading-[1.6rem]">{description}</p>
62+
<p className="line-clamp-6 md:text-sm md:leading-[1.6rem]">
63+
{description}
64+
</p>
6365
</CardContent>
6466
<CardFooter className="p-4 pt-0">
6567
<ButtonLink href={href} variant="outline" className="w-full text-sm">

src/components/Homepage/ValuesMarquee.tsx

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,15 @@ import {
1919
} from "../ui/section"
2020

2121
import { usePrefersReducedMotion } from "@/hooks/usePrefersReducedMotion"
22+
import { useRtlFlip } from "@/hooks/useRtlFlip"
2223

2324
type ItemProps = React.HTMLAttributes<HTMLButtonElement> & {
2425
pairing: Pairing
2526
separatorClass: string
2627
container?: HTMLElement | null
2728
label: string
2829
eventCategory: string
30+
direction: HTMLDivElement["dir"]
2931
}
3032

3133
const Item = ({
@@ -36,6 +38,7 @@ const Item = ({
3638
container,
3739
label,
3840
eventCategory,
41+
direction,
3942
}: ItemProps) => (
4043
<>
4144
<Tooltip
@@ -86,6 +89,7 @@ const Item = ({
8689
"flex flex-nowrap items-center text-nowrap rounded-full px-4 py-1 font-bold uppercase",
8790
className
8891
)}
92+
dir={direction}
8993
>
9094
{children}
9195
</div>
@@ -98,6 +102,7 @@ const Item = ({
98102
/>
99103
</>
100104
)
105+
Item.displayName = "MarqueeItem"
101106

102107
type RowProps = React.HTMLAttributes<HTMLDivElement> & {
103108
toRight?: boolean
@@ -106,12 +111,15 @@ type RowProps = React.HTMLAttributes<HTMLDivElement> & {
106111
const Row = forwardRef<HTMLDivElement, RowProps>(
107112
({ className, children, toRight }, ref) => {
108113
const { prefersReducedMotion } = usePrefersReducedMotion()
114+
109115
const fadeEdges = {
110116
mask: `linear-gradient(to right, transparent 1rem, white 15%, white 85%, transparent calc(100% - 1rem))`,
111117
}
112118

113119
return (
114-
<div ref={ref} className={cn("group", className)}>
120+
// Note: dir="ltr" forced on parent to prevent "translateX" animation bugs
121+
// Locale "direction" passed to marquee Item for correction
122+
<div ref={ref} className={cn("group", className)} dir="ltr">
115123
<div
116124
className="flex max-w-full overflow-hidden motion-reduce:overflow-auto"
117125
style={prefersReducedMotion ? {} : fadeEdges}
@@ -137,7 +145,7 @@ const Row = forwardRef<HTMLDivElement, RowProps>(
137145
)
138146
}
139147
)
140-
Row.displayName = "Row"
148+
Row.displayName = "MarqueeRow"
141149

142150
const ValuesMarquee = () => {
143151
const { t, pairings, eventCategory } = useValuesMarquee()
@@ -160,6 +168,8 @@ const ValuesMarquee = () => {
160168
}
161169
}, [])
162170

171+
const { direction, isRtl, twFlipForRtl } = useRtlFlip()
172+
163173
return (
164174
<Section id="values" className="!sm:my-64 !my-48 scroll-m-48">
165175
<SectionContent className="flex flex-col items-center text-center">
@@ -185,6 +195,7 @@ const ValuesMarquee = () => {
185195
separatorClass="bg-accent-a"
186196
className="group/item bg-blue-100 text-blue-600 hover:bg-blue-600 hover:text-white dark:hover:bg-blue-700"
187197
eventCategory={eventCategory}
198+
direction={direction}
188199
>
189200
<FaCheck className="me-1 text-success group-hover/item:text-white" />
190201
{pairing.ethereum.label}
@@ -206,13 +217,19 @@ const ValuesMarquee = () => {
206217
className="bg-gray-200/20 text-body-medium hover:bg-gray-600 hover:text-white dark:bg-gray-950 dark:text-body"
207218
separatorClass="bg-gray-200 dark:bg-gray-950"
208219
eventCategory={eventCategory}
220+
direction={direction}
209221
>
210222
{pairing.legacy.label}
211223
</Item>
212224
))}
213225
</Row>
214226

215-
<div className="absolute start-[50%] top-[50%] flex -translate-x-[50%] -translate-y-[50%] items-center overflow-hidden rounded-lg text-sm font-bold">
227+
<div
228+
className={cn(
229+
"absolute start-[50%] top-[50%] flex -translate-y-[50%] items-center overflow-hidden rounded-lg text-sm font-bold",
230+
isRtl ? "translate-x-[50%]" : "-translate-x-[50%]"
231+
)}
232+
>
216233
<p className="bg-gray-50 px-4 py-1 text-body-medium dark:bg-gray-800 dark:text-gray-200">
217234
{t("page-index-values-legacy")}
218235
</p>
@@ -222,7 +239,8 @@ const ValuesMarquee = () => {
222239
"border-t-[15px] border-t-blue-50 dark:border-t-blue-600",
223240
"border-r-8 border-r-blue-50 dark:border-r-blue-600",
224241
"border-b-[15px] border-b-gray-50 dark:border-b-gray-800",
225-
"border-l-8 border-l-gray-50 dark:border-l-gray-800"
242+
"border-l-8 border-l-gray-50 dark:border-l-gray-800",
243+
twFlipForRtl
226244
)}
227245
/>
228246

@@ -234,5 +252,6 @@ const ValuesMarquee = () => {
234252
</Section>
235253
)
236254
}
255+
ValuesMarquee.displayName = "ValuesMarquee"
237256

238257
export default ValuesMarquee

src/components/ui/tabs.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const TabsTrigger = React.forwardRef<
2727
<TabsPrimitive.Trigger
2828
ref={ref}
2929
className={cn(
30-
"inline-flex items-center justify-center whitespace-nowrap rounded-t border-b border-b-primary px-4 py-1.5 ring-offset-background transition-all focus-visible:outline focus-visible:outline-4 focus-visible:-outline-offset-1 focus-visible:outline-primary-hover disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-primary data-[state=active]:text-body-inverse",
30+
"inline-flex items-center justify-center rounded-t border-b border-b-primary px-4 py-1.5 ring-offset-background transition-all focus-visible:outline focus-visible:outline-4 focus-visible:-outline-offset-1 focus-visible:outline-primary-hover disabled:pointer-events-none disabled:opacity-50 data-[state=active]:bg-primary data-[state=active]:text-body-inverse",
3131
className
3232
)}
3333
{...props}

src/hooks/useStakingConsiderations.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -389,8 +389,8 @@ export const useStakingConsiderations = ({
389389
pageData[activeIndex]
390390

391391
const dropdownLinks: ButtonDropdownList = {
392-
text: "Staking Considerations",
393-
ariaLabel: "Dropdown menu for staking considerations",
392+
text: t("page-staking-considerations-dropdown-text"),
393+
ariaLabel: t("page-staking-considerations-dropdown-aria-label"),
394394
items: pageData.map(({ title, matomo }) => ({
395395
text: title,
396396
callback: setActiveIndex,

src/intl/en/page-staking.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
"page-staking-comparison-saas-pools": "These are similar in that you're generally relying on someone else to run the validator client, but unlike SaaS, pooled staking allows you to participate with smaller amounts of ETH. If you're looking to stake with less than 32 ETH, consider checking these out.",
9090
"page-staking-comparison-pools-solo": "Pooled staking has a significantly lower barrier to entry when compared to home staking, but comes with additional risk by delegating all node operations to a third-party, and with a fee. Home staking gives full sovereignty and control over the choices that go into choosing a staking setup. Stakers never have to hand over their keys, and they earn full rewards without any middlemen taking a cut.",
9191
"page-staking-comparison-pools-saas": "These are similar in that stakers do not run the validator software themselves, but unlike pooling options, SaaS requires a full 32 ETH deposit to activate a validator. Rewards accumulate to the staker, and usually involve a monthly fee or other stake to use the service. If you'd prefer your own validator keys and are looking to stake at least 32 ETH, using a SaaS provider may be a good option for you.",
92+
"page-staking-considerations-dropdown-text": "Staking Considerations",
93+
"page-staking-considerations-dropdown-aria-label": "Dropdown menu for staking considerations",
9294
"page-staking-considerations-solo-1-title": "Open source",
9395
"page-staking-considerations-solo-1-description": "Essential code is 100% open source and available to the public to fork and use",
9496
"page-staking-considerations-solo-1-warning": "Closed source",

src/layouts/md/Roadmap.tsx

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import { useTranslation } from "next-i18next"
2+
13
import type { ChildOnlyProp } from "@/lib/types"
24
import type { MdPageContent, RoadmapFrontmatter } from "@/lib/interfaces"
35

@@ -34,12 +36,14 @@ export const RoadmapLayout = ({
3436
tocItems,
3537
contentNotTranslated,
3638
}: RoadmapLayoutProps) => {
39+
const { t } = useTranslation("common")
40+
3741
const dropdownLinks: ButtonDropdownList = {
38-
text: "nav-roadmap-options",
39-
ariaLabel: "nav-roadmap-options-alt",
42+
text: t("common:nav-roadmap-options"),
43+
ariaLabel: t("common:nav-roadmap-options-alt"),
4044
items: [
4145
{
42-
text: "nav-roadmap-home",
46+
text: t("common:nav-roadmap-home"),
4347
href: "/roadmap/",
4448
matomo: {
4549
eventCategory: `Roadmap dropdown`,
@@ -48,7 +52,7 @@ export const RoadmapLayout = ({
4852
},
4953
},
5054
{
51-
text: "nav-roadmap-security",
55+
text: t("common:nav-roadmap-security"),
5256
href: "/roadmap/security",
5357
matomo: {
5458
eventCategory: `Roadmap security dropdown`,
@@ -57,7 +61,7 @@ export const RoadmapLayout = ({
5761
},
5862
},
5963
{
60-
text: "nav-roadmap-scaling",
64+
text: t("common:nav-roadmap-scaling"),
6165
href: "/roadmap/scaling",
6266
matomo: {
6367
eventCategory: `Roadmap scaling dropdown`,
@@ -66,7 +70,7 @@ export const RoadmapLayout = ({
6670
},
6771
},
6872
{
69-
text: "nav-roadmap-user-experience",
73+
text: t("common:nav-roadmap-user-experience"),
7074
href: "/roadmap/user-experience/",
7175
matomo: {
7276
eventCategory: `Roadmap user experience dropdown`,
@@ -75,7 +79,7 @@ export const RoadmapLayout = ({
7579
},
7680
},
7781
{
78-
text: "nav-roadmap-future-proofing",
82+
text: t("common:nav-roadmap-future-proofing"),
7983
href: "/roadmap/future-proofing",
8084
matomo: {
8185
eventCategory: `Roadmap future-proofing dropdown`,

src/pages/get-eth.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ const GetEthPage = ({
167167
priority
168168
/>
169169
<div className="my-8 flex flex-col items-center text-center lg:mx-0 lg:mb-0 lg:mt-24">
170-
<h1 className="my-8 text-4xl leading-6 md:text-5xl">
170+
<h1 className="my-8 text-4xl md:text-5xl">
171171
{t("page-get-eth-where-to-buy-title")}
172172
</h1>
173173
<p className="mb-0 max-w-[45ch] text-center text-xl leading-snug text-body-medium">

0 commit comments

Comments
 (0)