Skip to content

Commit 1374274

Browse files
TylerAPfleddererTylerAPfledderer
committed
Merge remote-tracking branch 'upstream/dev' into feat/shadcn-tables
2 parents fb42e3a + 065a055 commit 1374274

File tree

348 files changed

+15544
-8509
lines changed

Some content is hidden

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

348 files changed

+15544
-8509
lines changed

‎.all-contributorsrc

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12389,6 +12389,96 @@
1238912389
"contributions": [
1239012390
"bug"
1239112391
]
12392+
},
12393+
{
12394+
"login": "zaryab2000",
12395+
"name": "Zaryab",
12396+
"avatar_url": "https://avatars.githubusercontent.com/u/42082608?v=4",
12397+
"profile": "https://www.zaryabs.com/",
12398+
"contributions": [
12399+
"content"
12400+
]
12401+
},
12402+
{
12403+
"login": "yannggg",
12404+
"name": "Yann Gerardi",
12405+
"avatar_url": "https://avatars.githubusercontent.com/u/29145014?v=4",
12406+
"profile": "https://www.mtpelerin.com",
12407+
"contributions": [
12408+
"code"
12409+
]
12410+
},
12411+
{
12412+
"login": "panditdhamdhere",
12413+
"name": "Pandit Dhamdhere",
12414+
"avatar_url": "https://avatars.githubusercontent.com/u/85685981?v=4",
12415+
"profile": "https://github.com/panditdhamdhere",
12416+
"contributions": [
12417+
"code"
12418+
]
12419+
},
12420+
{
12421+
"login": "ferreiramarcelo",
12422+
"name": "M@rC3L0",
12423+
"avatar_url": "https://avatars.githubusercontent.com/u/11818521?v=4",
12424+
"profile": "http://linkedin.com/in/fmarcelo",
12425+
"contributions": [
12426+
"ideas"
12427+
]
12428+
},
12429+
{
12430+
"login": "Refdeveloper",
12431+
"name": "DevOFtoken",
12432+
"avatar_url": "https://avatars.githubusercontent.com/u/87125773?v=4",
12433+
"profile": "https://github.com/Refdeveloper",
12434+
"contributions": [
12435+
"ideas"
12436+
]
12437+
},
12438+
{
12439+
"login": "vvvvvv1vvvvvv",
12440+
"name": "vvvvvv1vvvvvv",
12441+
"avatar_url": "https://avatars.githubusercontent.com/u/86296331?v=4",
12442+
"profile": "https://github.com/vvvvvv1vvvvvv",
12443+
"contributions": [
12444+
"doc"
12445+
]
12446+
},
12447+
{
12448+
"login": "abraj",
12449+
"name": "Abhishek Raj",
12450+
"avatar_url": "https://avatars.githubusercontent.com/u/8170980?v=4",
12451+
"profile": "https://raj.me",
12452+
"contributions": [
12453+
"content"
12454+
]
12455+
},
12456+
{
12457+
"login": "p1kalys",
12458+
"name": "Pavan Emani",
12459+
"avatar_url": "https://avatars.githubusercontent.com/u/85685112?v=4",
12460+
"profile": "https://github.com/p1kalys",
12461+
"contributions": [
12462+
"content"
12463+
]
12464+
},
12465+
{
12466+
"login": "makoshan",
12467+
"name": "Mako Shan",
12468+
"avatar_url": "https://avatars.githubusercontent.com/u/7024451?v=4",
12469+
"profile": "https://v2eth.com/",
12470+
"contributions": [
12471+
"content"
12472+
]
12473+
},
12474+
{
12475+
"login": "cratiu222",
12476+
"name": "Christina",
12477+
"avatar_url": "https://avatars.githubusercontent.com/u/156356273?v=4",
12478+
"profile": "https://github.com/cratiu222",
12479+
"contributions": [
12480+
"content"
12481+
]
1239212482
}
1239312483
],
1239412484
"contributorsPerLine": 7,

‎.eslintrc.json

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99
"env": {
1010
"es6": true
1111
},
12-
"plugins": [
13-
"simple-import-sort",
14-
"@typescript-eslint",
15-
"unused-imports"
16-
],
12+
"plugins": ["simple-import-sort", "@typescript-eslint", "unused-imports"],
1713
"parser": "@typescript-eslint/parser",
1814
"rules": {
1915
"simple-import-sort/imports": [
@@ -26,55 +22,29 @@
2622
],
2723
// Packages. `react` related packages come first.
2824
// Also, put `react-icons` in sorting order not with `react`
29-
[
30-
"^react(?!-.)$",
31-
"^\\w",
32-
"^@\\w"
33-
],
25+
["^react(?!-.)$", "^\\w", "^@\\w"],
3426
// The Chakra theme directory if imported to story file or other places
35-
[
36-
"^@/@chakra-ui"
37-
],
27+
["^@/@chakra-ui"],
3828
// From the `types` directory.
39-
[
40-
"^@/lib/types",
41-
"^@/lib/interfaces"
42-
],
29+
["^@/lib/types", "^@/lib/interfaces"],
4330
// From the `components` directory.
44-
[
45-
"^@/components"
46-
],
31+
["^@/components"],
4732
// From the `utils` directory.
48-
[
49-
"^@/lib/utils"
50-
],
33+
["^@/lib/utils"],
5134
// From the `data` directory.
52-
[
53-
"^@/data"
54-
],
35+
["^@/data"],
5536
// From the `constants` directory.
5637
["^@/lib/constants"],
5738
// From the `.storybook/utils` file
5839
["^@/storybook-utils"],
5940
// Parent imports. Put `..` last.
60-
[
61-
"^\\.\\.(?!/?$)",
62-
"^\\.\\./?$"
63-
],
41+
["^\\.\\.(?!/?$)", "^\\.\\./?$"],
6442
// Other relative imports. Put same-folder imports and `.` last.
65-
[
66-
"^\\./(?=.*/)(?!/?$)",
67-
"^\\.(?!/?$)",
68-
"^\\./?$"
69-
],
43+
["^\\./(?=.*/)(?!/?$)", "^\\.(?!/?$)", "^\\./?$"],
7044
// Style imports.
71-
[
72-
"^.+\\.s?css$"
73-
],
45+
["^.+\\.s?css$"],
7446
// Side effect imports.
75-
[
76-
"^\\u0000"
77-
]
47+
["^\\u0000"]
7848
]
7949
}
8050
],
@@ -89,7 +59,7 @@
8959
],
9060
"unused-imports/no-unused-vars": [
9161
"error",
92-
{
62+
{
9363
"args": "all",
9464
"argsIgnorePattern": "^_$",
9565
"varsIgnorePattern": "^_$"
@@ -98,4 +68,3 @@
9868
"unused-imports/no-unused-imports-ts": "warn"
9969
}
10070
}
101-

‎.github/workflows/non-english-warning.yml

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

‎.github/workflows/wallets-check.yml

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
name: Check Wallet Data for new_to_crypto
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- "src/data/wallets/wallet-data.ts"
7+
8+
jobs:
9+
check_new_to_crypto:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- name: Checkout repository
13+
uses: actions/checkout@v3
14+
15+
- name: Check for new_to_crypto
16+
id: check_new_to_crypto
17+
run: |
18+
if git diff --name-only HEAD^ | grep -q "data/wallets/wallet-data.ts"; then
19+
if git diff -U0 HEAD^ HEAD data/wallets/wallet-data.ts | grep -q "+.*new_to_crypto: true"; then
20+
echo "New wallet added with 'new_to_crypto: true'"
21+
echo "new_to_crypto_found=true" >> $GITHUB_OUTPUT
22+
else
23+
echo "new_to_crypto_found=false" >> $GITHUB_OUTPUT
24+
fi
25+
fi
26+
27+
- name: Comment on PR if new_to_crypto is added
28+
if: steps.check_new_to_crypto.outputs.new_to_crypto_found == 'true'
29+
uses: actions-ecosystem/action-add-comment@v1
30+
with:
31+
github-token: ${{ secrets.GITHUB_TOKEN }}
32+
body: "A wallet has been added with 'new_to_crypto: true'. Please ensure this meets our guidelines."

‎.storybook/i18next.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ export const ns = [
2222
"page-developers-index",
2323
"page-what-is-ethereum",
2424
"page-upgrades-index",
25+
"page-developers-docs",
2526
] as const
2627
const supportedLngs = Object.keys(baseLocales)
2728

‎.storybook/preview.tsx

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
import isChromatic from "chromatic/isChromatic"
22
import { MotionGlobalConfig } from "framer-motion"
3-
import { withThemeByDataAttribute } from "@storybook/addon-themes"
43
import type { Preview } from "@storybook/react"
54

65
import ThemeProvider from "@/components/ThemeProvider"
6+
import { TooltipProvider } from "@/components/ui/tooltip"
77

88
import i18n, { baseLocales } from "./i18next"
9+
import { withNextThemes } from "./withNextThemes"
910

1011
import "../src/styles/global.css"
1112
import "../src/styles/fonts.css"
13+
import "../src/styles/docsearch.css"
14+
15+
import "@docsearch/css"
1216

1317
MotionGlobalConfig.skipAnimations = isChromatic()
1418

@@ -27,7 +31,7 @@ const preview: Preview = {
2731
locales: baseLocales,
2832
},
2933
decorators: [
30-
withThemeByDataAttribute({
34+
withNextThemes({
3135
themes: {
3236
light: "light",
3337
dark: "dark",
@@ -36,7 +40,9 @@ const preview: Preview = {
3640
}),
3741
(Story) => (
3842
<ThemeProvider>
39-
<Story />
43+
<TooltipProvider>
44+
<Story />
45+
</TooltipProvider>
4046
</ThemeProvider>
4147
),
4248
],

‎.storybook/withNextThemes.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
import { useEffect } from "react"
2+
import { useTheme } from "next-themes"
3+
import {
4+
type DataAttributeStrategyConfiguration,
5+
DecoratorHelpers,
6+
} from "@storybook/addon-themes"
7+
import type { Decorator } from "@storybook/react/*"
8+
9+
const { initializeThemeState, pluckThemeFromContext } = DecoratorHelpers
10+
11+
export const withNextThemes = ({
12+
themes,
13+
defaultTheme,
14+
}: DataAttributeStrategyConfiguration): Decorator => {
15+
initializeThemeState(Object.keys(themes), defaultTheme)
16+
17+
return (getStory, context) => {
18+
const selectedTheme = pluckThemeFromContext(context)
19+
const selected = selectedTheme || defaultTheme
20+
const { setTheme } = useTheme()
21+
22+
useEffect(() => {
23+
setTheme(selected)
24+
}, [selected, setTheme])
25+
26+
return getStory(context)
27+
}
28+
}

0 commit comments

Comments
 (0)