Skip to content

Commit 18998d1

Browse files
committed
Merge branch 'dev' into shadcn/EnergyConsumptionChart
2 parents a9abe64 + ece1544 commit 18998d1

File tree

4 files changed

+9
-4
lines changed

4 files changed

+9
-4
lines changed

public/content/contributing/translation-program/translatathon/details/index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,9 @@ EthStaker
123123
- https://crowdin.com/project/ethstaker-website
124124
- https://crowdin.com/project/ethstaker-knowledge-base
125125

126+
Solidity Language Docs
127+
- https://crowdin.com/project/solidity-language-docs
128+
126129
### Evaluation process
127130

128131
All translations will be subject to QA and feedback, where professional linguists will evaluate submissions based on quality and accuracy.

src/components/FeedbackCard.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ import { FeedbackThumbsUpIcon } from "@/components/icons"
99
import { trackCustomEvent } from "@/lib/utils/matomo"
1010
import { isLangRightToLeft } from "@/lib/utils/translations"
1111

12-
import { Button } from "../../tailwind/ui/buttons/Button"
13-
12+
import { Button } from "./ui/buttons/Button"
1413
import Translation from "./Translation"
1514

1615
import { useSurvey } from "@/hooks/useSurvey"

src/components/LanguagePicker/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ const LanguagePicker = ({
4444
* @param {string} event - The keydown event.
4545
*/
4646
useEventListener("keydown", (e) => {
47-
if (e.key !== "\\") return
47+
if (e.key !== "\\" || e.metaKey || e.ctrlKey) return
4848
e.preventDefault()
4949
onOpen()
5050
})

src/components/Quiz/QuizWidget/useQuizWidget.tsx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { useEffect, useMemo, useState } from "react"
2+
import isChromatic from "chromatic"
23
import shuffle from "lodash/shuffle"
34
import { useTranslation } from "next-i18next"
45

@@ -51,7 +52,9 @@ export const useQuizWidget = ({
5152
const rawQuestion: RawQuestion = questionBank[id]
5253
return { id, ...rawQuestion }
5354
})
54-
const shuffledQuestions = shuffle(questions)
55+
56+
// ! Do not shuffle questions in Chromatic to keep the modal story snapshot stable
57+
const shuffledQuestions = isChromatic() ? questions : shuffle(questions)
5558
const quiz: Quiz = {
5659
title: t(rawQuiz.title),
5760
questions: shuffledQuestions,

0 commit comments

Comments
 (0)