Skip to content

Commit 8b7c325

Browse files
committed
Merge branch 'dev' into 404.tsx
2 parents 375e930 + aa64bd6 commit 8b7c325

26 files changed

+1040
-377
lines changed

next.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@ module.exports = (phase, { defaultConfig }) => {
6363
trailingSlash: true,
6464
images: {
6565
deviceSizes: [640, 750, 828, 1080, 1200, 1504, 1920],
66+
remotePatterns: [
67+
{
68+
protocol: "https",
69+
hostname: "crowdin-static.downloads.crowdin.com",
70+
},
71+
],
6672
},
6773
}
6874

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ethereum-org-website",
3-
"version": "9.3.0",
3+
"version": "9.4.0",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

public/content/staking/solo/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Home stakers are responsible for operating the hardware needed to run these clie
2525

2626
A home staker receives rewards directly from the protocol for keeping their validator properly functioning and online.
2727

28-
## Why stake home? {#why-stake-solo}
28+
## Why stake from home? {#why-stake-solo}
2929

3030
Home staking comes with more responsibility but provides you with maximum control over your funds and staking setup.
3131

public/content/translations/uz/staking/pools/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ Sozlashda sizga yordam beradigan turli xil variantlar mavjud. Quyidagi vositalar
5757

5858
Biz o‘tkazib yuborgan staking vositasi uchun taklif bormi? [Mahsulotni kataloglash qoidalari](/contributing/adding-staking-products/) bilan tanishib chiqing va ularni ko‘rib chiqish uchun yuboring.
5959

60-
## Frequently asked questions {#faq}
60+
## Tez-tez beriladigan savollar {#faq}
6161

6262
<ExpandableCard title="Mukofotlarni qanday olaman?">
6363
Odatda, ERC-20 staking tokenlari ishtirokchilarga beriladi va ular tikkan ETH qiymati va mukofotlarini ifodalaydi. Shuni yodda tutingki, turli pullar o‘z foydalanuvchilariga staking mukofotlarini biroz boshqacha usullar bilan tarqatadi, ammo bu umumiy mavzu.

public/content/translations/uz/staking/saas/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Quyida mavjud SaaS provayderlari keltirilgan. Yuqoridagi ko‘rsatkichlardan ush
5555

5656
Biz o‘tkazib yuborgan xizmat sifatida staking provayderi uchun taklif bormi? [Mahsulotni kataloglash qoidalari](/contributing/adding-staking-products/) bilan tanishib chiqing va ularni ko‘rib chiqish uchun yuboring.
5757

58-
## Frequently asked questions {#faq}
58+
## Tez-tez beriladigan savollar {#faq}
5959

6060
<ExpandableCard title="Mening kalitlarim kimda boʻladi?" eventCategory="SaasStaking" eventName="clicked who holds my keys">
6161
Kelishishlar provayderdan provayderga farq qiladi, lekin odatda sizga kerakli imzolash kalitlarini sozlash (32 ETH uchun bitta) va ularni provayderingizga yuklash orqali ular sizning nomingizdan tasdiqlanishiga ruxsat beriladi. Imzolash kalitlarining o‘zi mablag‘larni yechib olish, o‘tkazish yoki sarflash imkonini bermaydi. Biroq, ular konsensusga ovoz berish imkoniyatini beradi, agar bu to‘g‘ri amalga oshirilmasa, oflayn jarimalar yoki qisqartirishga olib kelishi mumkin.

public/content/translations/uz/staking/solo/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ Biz o‘tkazib yuborgan staking vositasi uchun taklif bormi? [Mahsulotni katalog
123123

124124
<StakingGuides />
125125

126-
## Frequently asked questions {#faq}
126+
## Tez-tez beriladigan savollar {#faq}
127127

128128
Bular garovga qo‘yishning eng keng tarqalgan savollaridan bir nechtasi bo‘lib, ular haqida bilishga arziydi.
129129

public/content/translations/uz/staking/withdrawals/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Ushbu hisob-kitobni kengaytirib, ma’lum miqdordagi pul yechib olish amaliyotla
125125

126126
Ko‘rib turganingizdek, tarmoqdagi tasdiqlovchilar soni ko‘paygan sari bu jarayon sekinlashib boradi. O‘tkazib yuborilgan slotlar sonining ortishi bu jarayonni mutanosib ravishda sekinlashtirishi mumkin, biroq bu umuman olganda ehtimoliy natijalarning sekinroq kechishini aks ettiradi.
127127

128-
## Frequently asked questions {#faq}
128+
## Tez-tez beriladigan savollar {#faq}
129129

130130
<ExpandableCard
131131
title="Yechib olish manzilini taqdim etganimdan so‘ng, uni boshqa bir yechib olish manziliga o‘zgartira olamanmi?"

src/components/FileContributors.tsx

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@ import type { ChildOnlyProp, FileContributor } from "@/lib/types"
1212

1313
import { Button } from "@/components/Buttons"
1414
import InlineLink from "@/components/Link"
15-
import Modal from "@/components/Modal"
1615
import Text from "@/components/OldText"
1716
import Translation from "@/components/Translation"
1817

1918
import { trackCustomEvent } from "@/lib/utils/matomo"
2019

20+
import Modal from "./ui/dialog-modal"
21+
22+
import { useBreakpointValue } from "@/hooks/useBreakpointValue"
23+
2124
const ContributorList = ({ children }: Required<ChildOnlyProp>) => (
2225
<UnorderedList maxH="2xs" m={0} mt={6} overflowY="scroll">
2326
{children}
@@ -61,12 +64,14 @@ const FileContributors = ({
6164
date: Date.now().toString(),
6265
} as FileContributor)
6366

67+
const modalSize = useBreakpointValue({ base: "xl", md: "md" } as const)
68+
6469
return (
6570
<>
6671
<Modal
67-
isOpen={isModalOpen}
68-
onClose={() => setModalOpen(false)}
69-
size={{ base: "full", md: "xl" }}
72+
open={isModalOpen}
73+
onOpenChange={(open) => setModalOpen(open)}
74+
size={modalSize}
7075
title={<Translation id="contributors" />}
7176
>
7277
<Translation id="contributors-thanks" />

src/components/Modal/index.tsx

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/components/Quiz/QuizzesModal.tsx

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
import { QuizStatus } from "@/lib/types"
22

3-
import Modal from "../Modal"
3+
import Modal, { type ModalProps } from "../ui/dialog-modal"
44
import { Center } from "../ui/flex"
55

6+
import { useBreakpointValue } from "@/hooks/useBreakpointValue"
7+
68
type QuizzesModalProps = {
79
isQuizModalOpen: boolean
8-
onQuizModalClose: () => void
10+
onQuizModalOpenChange: (open: boolean) => void
911
children: React.ReactNode
1012
quizStatus: QuizStatus
1113
}
@@ -14,7 +16,7 @@ const QuizzesModal = ({
1416
children,
1517
quizStatus,
1618
isQuizModalOpen,
17-
onQuizModalClose,
19+
onQuizModalOpenChange,
1820
...props
1921
}: QuizzesModalProps) => {
2022
// TODO: remove bang in utility class names when Modal is migrated
@@ -25,11 +27,13 @@ const QuizzesModal = ({
2527
return "!bg-error-light dark:!bg-error-dark"
2628
}
2729

30+
const size = useBreakpointValue<ModalProps["size"]>({ base: "xl", md: "md" })!
31+
2832
return (
2933
<Modal
30-
isOpen={isQuizModalOpen}
31-
onClose={onQuizModalClose}
32-
size={{ base: "full", md: "xl" }}
34+
open={isQuizModalOpen}
35+
onOpenChange={onQuizModalOpenChange}
36+
size={size}
3337
contentProps={{ className: getStatusColorClass() }}
3438
{...props}
3539
>

0 commit comments

Comments
 (0)