Skip to content

Commit 0b6e66c

Browse files
committed
Merge remote-tracking branch 'origin/main' into feature/chia-theme-variants-and-overview
Co-authored-by: Cursor <cursoragent@cursor.com> # Conflicts: # .github/workflows/audit.yml # .github/workflows/check-commit-signing.yml # .github/workflows/code-check.yml # .github/workflows/crowdin-pull.yml # .github/workflows/crowdin-push.yml # .github/workflows/dependency-cursor-review.yml # .github/workflows/dependency-review.yml # .github/workflows/extract-strings.yml # package-lock.json # package.json # packages/api-react/src/services/index.ts # packages/api-react/src/services/wallet.ts # packages/api/src/services/WalletService.test.ts # packages/api/src/services/WalletService.ts # packages/api/src/wallets/DID.ts # packages/core/package.json # packages/core/src/components/Button/Button.tsx # packages/core/src/components/ButtonLoading/ButtonLoading.tsx # packages/core/src/components/ButtonLoading/index.ts # packages/core/src/components/CardListItem/CardListItem.tsx # packages/core/src/components/CardSimple/CardSimple.tsx # packages/core/src/components/ConfirmDialog/ConfirmDialog.tsx # packages/core/src/components/Fonts/Fonts.tsx # packages/core/src/components/LayoutDashboard/LayoutDashboard.tsx # packages/core/src/components/LineChart/LineChart.tsx # packages/core/src/components/Logo/Logo.tsx # packages/core/src/components/Settings/SettingsApp.tsx # packages/core/src/components/SideBarItem/SideBarItem.tsx # packages/core/src/components/StateIndicator/StateIndicator.tsx # packages/core/src/components/StateIndicator/StateIndicatorDot.tsx # packages/core/src/components/Table/TableControlled.tsx # packages/core/src/components/index.ts # packages/core/src/hooks/index.ts # packages/core/src/locales/ak-GH/messages.po # packages/core/src/locales/ar-SA/messages.po # packages/core/src/locales/be-BY/messages.po # packages/core/src/locales/bg-BG/messages.po # packages/core/src/locales/bn-BD/messages.po # packages/core/src/locales/bn-IN/messages.po # packages/core/src/locales/bs-BA/messages.po # packages/core/src/locales/ca-ES/messages.po # packages/core/src/locales/cs-CZ/messages.po # packages/core/src/locales/cy-GB/messages.po # packages/core/src/locales/da-DK/messages.po # packages/core/src/locales/de-DE/messages.po # packages/core/src/locales/el-GR/messages.po # packages/core/src/locales/en-AU/messages.po # packages/core/src/locales/en-NZ/messages.po # packages/core/src/locales/en-PT/messages.po # packages/core/src/locales/en-US/messages.po # packages/core/src/locales/eo-UY/messages.po # packages/core/src/locales/es-AR/messages.po # packages/core/src/locales/es-ES/messages.po # packages/core/src/locales/es-MX/messages.po # packages/core/src/locales/fa-IR/messages.po # packages/core/src/locales/fi-FI/messages.po # packages/core/src/locales/fr-FR/messages.po # packages/core/src/locales/he-IL/messages.po # packages/core/src/locales/hi-IN/messages.po # packages/core/src/locales/hr-HR/messages.po # packages/core/src/locales/hu-HU/messages.po # packages/core/src/locales/id-ID/messages.po # packages/core/src/locales/is-IS/messages.po # packages/core/src/locales/it-IT/messages.po # packages/core/src/locales/ja-JP/messages.po # packages/core/src/locales/km-KH/messages.po # packages/core/src/locales/ko-KR/messages.po # packages/core/src/locales/lol-US/messages.po # packages/core/src/locales/lt-LT/messages.po # packages/core/src/locales/lv-LV/messages.po # packages/core/src/locales/mk-MK/messages.po # packages/core/src/locales/mn-MN/messages.po # packages/core/src/locales/nl-NL/messages.po # packages/core/src/locales/no-NO/messages.po # packages/core/src/locales/pa-IN/messages.po # packages/core/src/locales/pl-PL/messages.po # packages/core/src/locales/pt-BR/messages.po # packages/core/src/locales/pt-PT/messages.po # packages/core/src/locales/ro-RO/messages.po # packages/core/src/locales/ru-RU/messages.po # packages/core/src/locales/si-LK/messages.po # packages/core/src/locales/sk-SK/messages.po # packages/core/src/locales/sl-SI/messages.po # packages/core/src/locales/sq-AL/messages.po # packages/core/src/locales/sr-SP/messages.po # packages/core/src/locales/srp/messages.po # packages/core/src/locales/sv-SE/messages.po # packages/core/src/locales/th-TH/messages.po # packages/core/src/locales/tlh-AA/messages.po # packages/core/src/locales/tr-TR/messages.po # packages/core/src/locales/uk-UA/messages.po # packages/core/src/locales/vi-VN/messages.po # packages/core/src/locales/zh-CN/messages.po # packages/core/src/locales/zh-TW/messages.po # packages/core/src/screens/SelectKey/SelectKey.tsx # packages/core/src/theme/dark.ts # packages/core/src/theme/default.ts # packages/core/src/theme/index.ts # packages/core/src/theme/light.ts # packages/core/src/utils/chiaToMojo.ts # packages/core/src/utils/useColorModeValue.ts # packages/gui/package.json # packages/gui/src/@types/Pair.ts # packages/gui/src/@types/PermissionsService.ts # packages/gui/src/components/app/AppProviders.tsx # packages/gui/src/components/app/AppRouter.tsx # packages/gui/src/components/app/AppSelectMode.tsx # packages/gui/src/components/app/AppStatusHeader.tsx # packages/gui/src/components/dashboard/DashboardSideBar.tsx # packages/gui/src/components/farm/FarmHealth.tsx # packages/gui/src/components/farm/PoolingHealth.tsx # packages/gui/src/components/fullNode/FullNode.jsx # packages/gui/src/components/fullNode/card/FullNodeCardStatus.tsx # packages/gui/src/components/harvest/HarvesterDetail.tsx # packages/gui/src/components/harvest/HarvesterPlotDetails.tsx # packages/gui/src/components/harvest/LatencyCharts.tsx # packages/gui/src/components/harvest/PlotDetailsChart.tsx # packages/gui/src/components/nfts/NFTHashStatus.tsx # packages/gui/src/components/nfts/NFTPreview.tsx # packages/gui/src/components/nfts/NFTPreviewDialog.tsx # packages/gui/src/components/nfts/NFTProgressBar.tsx # packages/gui/src/components/nfts/detail/NFTDetailV2.tsx # packages/gui/src/components/offers/NFTOfferEditor.tsx # packages/gui/src/components/offers2/OfferBuilderImport.tsx # packages/gui/src/components/plot/PlotStatus.tsx # packages/gui/src/components/plotNFT/PlotNFTGraph.tsx # packages/gui/src/components/settings/SettingsIntegration.tsx # packages/gui/src/components/signVerify/VerifyMessageImport.tsx # packages/gui/src/components/vcs/VCList.tsx # packages/gui/src/components/walletConnect/WalletConnectAddConnectionDialog.tsx # packages/gui/src/components/walletConnect/WalletConnectConnections.tsx # packages/gui/src/components/walletConnect/WalletConnectDropdown.tsx # packages/gui/src/components/walletConnect/WalletConnectProvider.tsx # packages/gui/src/electron/constants/PermissionsAPI.ts # packages/gui/src/electron/dialogs/About/About.tsx # packages/gui/src/electron/dialogs/Confirm/Confirm.tsx # packages/gui/src/electron/dialogs/KeyDetail/KeyDetail.tsx # packages/gui/src/electron/dialogs/Pair/Pair.tsx # packages/gui/src/electron/main.tsx # packages/gui/src/electron/prefs.ts # packages/gui/src/electron/preload.ts # packages/gui/src/electron/utils/chiaEnvironment.js # packages/gui/src/electron/utils/chiaFormatter.ts # packages/gui/src/electron/utils/isValidURL.ts # packages/gui/src/electron/utils/loadConfig.ts # packages/gui/src/electron/utils/mojoToCATLocaleString.ts # packages/gui/src/electron/utils/mojoToChia.ts # packages/gui/src/electron/utils/mojoToChiaLocaleString.ts # packages/gui/src/electron/utils/openReactDialog.tsx # packages/gui/src/electron/utils/toCamelCase.ts # packages/gui/src/electron/utils/toSnakeCase.ts # packages/gui/src/electron/utils/webSocketBridge.ts # packages/gui/src/hooks/useStandardWallet.ts # packages/gui/src/hooks/useWalletConnect.ts # packages/gui/src/hooks/useWalletConnectCommand.tsx # packages/gui/src/hooks/useWalletConnectPreferences.ts # packages/gui/src/locales/ak-GH/messages.po # packages/gui/src/locales/ar-SA/messages.po # packages/gui/src/locales/be-BY/messages.po # packages/gui/src/locales/bg-BG/messages.po # packages/gui/src/locales/bn-BD/messages.po # packages/gui/src/locales/bn-IN/messages.po # packages/gui/src/locales/bs-BA/messages.po # packages/gui/src/locales/ca-ES/messages.po # packages/gui/src/locales/cs-CZ/messages.po # packages/gui/src/locales/cy-GB/messages.po # packages/gui/src/locales/da-DK/messages.po # packages/gui/src/locales/de-DE/messages.po # packages/gui/src/locales/el-GR/messages.po # packages/gui/src/locales/en-AU/messages.po # packages/gui/src/locales/en-NZ/messages.po # packages/gui/src/locales/en-PT/messages.po # packages/gui/src/locales/en-US/messages.po # packages/gui/src/locales/eo-UY/messages.po # packages/gui/src/locales/es-AR/messages.po # packages/gui/src/locales/es-ES/messages.po # packages/gui/src/locales/es-MX/messages.po # packages/gui/src/locales/fa-IR/messages.po # packages/gui/src/locales/fi-FI/messages.po # packages/gui/src/locales/fr-FR/messages.po # packages/gui/src/locales/he-IL/messages.po # packages/gui/src/locales/hi-IN/messages.po # packages/gui/src/locales/hr-HR/messages.po # packages/gui/src/locales/hu-HU/messages.po # packages/gui/src/locales/id-ID/messages.po # packages/gui/src/locales/is-IS/messages.po # packages/gui/src/locales/it-IT/messages.po # packages/gui/src/locales/ja-JP/messages.po # packages/gui/src/locales/km-KH/messages.po # packages/gui/src/locales/ko-KR/messages.po # packages/gui/src/locales/lol-US/messages.po # packages/gui/src/locales/lt-LT/messages.po # packages/gui/src/locales/lv-LV/messages.po # packages/gui/src/locales/mk-MK/messages.po # packages/gui/src/locales/mn-MN/messages.po # packages/gui/src/locales/nl-NL/messages.po # packages/gui/src/locales/no-NO/messages.po # packages/gui/src/locales/pa-IN/messages.po # packages/gui/src/locales/pl-PL/messages.po # packages/gui/src/locales/pt-BR/messages.po # packages/gui/src/locales/pt-PT/messages.po # packages/gui/src/locales/ro-RO/messages.po # packages/gui/src/locales/ru-RU/messages.po # packages/gui/src/locales/si-LK/messages.po # packages/gui/src/locales/sk-SK/messages.po # packages/gui/src/locales/sl-SI/messages.po # packages/gui/src/locales/sq-AL/messages.po # packages/gui/src/locales/sr-SP/messages.po # packages/gui/src/locales/srp/messages.po # packages/gui/src/locales/sv-SE/messages.po # packages/gui/src/locales/th-TH/messages.po # packages/gui/src/locales/tlh-AA/messages.po # packages/gui/src/locales/tr-TR/messages.po # packages/gui/src/locales/uk-UA/messages.po # packages/gui/src/locales/vi-VN/messages.po # packages/gui/src/locales/zh-CN/messages.po # packages/gui/src/locales/zh-TW/messages.po # packages/gui/src/util/createOfferForIdsToOfferBuilderData.test.ts # packages/gui/src/util/createOfferForIdsToOfferBuilderData.ts # packages/gui/src/util/prepareNFTOffer.test.ts # packages/gui/src/util/prepareNFTOffer.ts # packages/gui/tsconfig.json # packages/gui/webpack.react.babel.ts # packages/icons/src/Chia.tsx # packages/icons/src/images/chia.svg # packages/icons/src/index.ts # packages/wallets/src/components/WalletGraphTooltip.tsx # packages/wallets/src/components/WalletsManageTokens.tsx # packages/wallets/src/locales/ak-GH/messages.po # packages/wallets/src/locales/ar-SA/messages.po # packages/wallets/src/locales/be-BY/messages.po # packages/wallets/src/locales/bg-BG/messages.po # packages/wallets/src/locales/bn-BD/messages.po # packages/wallets/src/locales/bn-IN/messages.po # packages/wallets/src/locales/bs-BA/messages.po # packages/wallets/src/locales/ca-ES/messages.po # packages/wallets/src/locales/cs-CZ/messages.po # packages/wallets/src/locales/cy-GB/messages.po # packages/wallets/src/locales/da-DK/messages.po # packages/wallets/src/locales/de-DE/messages.po # packages/wallets/src/locales/el-GR/messages.po # packages/wallets/src/locales/en-AU/messages.po # packages/wallets/src/locales/en-NZ/messages.po # packages/wallets/src/locales/en-PT/messages.po # packages/wallets/src/locales/en-US/messages.po # packages/wallets/src/locales/eo-UY/messages.po # packages/wallets/src/locales/es-AR/messages.po # packages/wallets/src/locales/es-ES/messages.po # packages/wallets/src/locales/es-MX/messages.po # packages/wallets/src/locales/fa-IR/messages.po # packages/wallets/src/locales/fi-FI/messages.po # packages/wallets/src/locales/fr-FR/messages.po # packages/wallets/src/locales/he-IL/messages.po # packages/wallets/src/locales/hi-IN/messages.po # packages/wallets/src/locales/hr-HR/messages.po # packages/wallets/src/locales/hu-HU/messages.po # packages/wallets/src/locales/id-ID/messages.po # packages/wallets/src/locales/is-IS/messages.po # packages/wallets/src/locales/it-IT/messages.po # packages/wallets/src/locales/ja-JP/messages.po # packages/wallets/src/locales/km-KH/messages.po # packages/wallets/src/locales/ko-KR/messages.po # packages/wallets/src/locales/lol-US/messages.po # packages/wallets/src/locales/lt-LT/messages.po # packages/wallets/src/locales/lv-LV/messages.po # packages/wallets/src/locales/mk-MK/messages.po # packages/wallets/src/locales/mn-MN/messages.po # packages/wallets/src/locales/nl-NL/messages.po # packages/wallets/src/locales/no-NO/messages.po # packages/wallets/src/locales/pa-IN/messages.po # packages/wallets/src/locales/pl-PL/messages.po # packages/wallets/src/locales/pt-BR/messages.po # packages/wallets/src/locales/pt-PT/messages.po # packages/wallets/src/locales/ro-RO/messages.po # packages/wallets/src/locales/ru-RU/messages.po # packages/wallets/src/locales/si-LK/messages.po # packages/wallets/src/locales/sk-SK/messages.po # packages/wallets/src/locales/sl-SI/messages.po # packages/wallets/src/locales/sq-AL/messages.po # packages/wallets/src/locales/srp/messages.po # packages/wallets/src/locales/sv-SE/messages.po # packages/wallets/src/locales/th-TH/messages.po # packages/wallets/src/locales/tlh-AA/messages.po # packages/wallets/src/locales/tr-TR/messages.po # packages/wallets/src/locales/uk-UA/messages.po # packages/wallets/src/locales/vi-VN/messages.po # packages/wallets/src/locales/zh-CN/messages.po # packages/wallets/src/locales/zh-TW/messages.po
2 parents 2fb0620 + 16ab590 commit 0b6e66c

314 files changed

Lines changed: 148675 additions & 74508 deletions

File tree

Some content is hidden

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

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929

3030
steps:
3131
- name: Checkout Code
32-
uses: actions/checkout@v6
32+
uses: actions/checkout@v7
3333
with:
3434
fetch-depth: 0
3535

.github/workflows/check-commit-signing.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Checkout Code
25-
uses: actions/checkout@v6
25+
uses: actions/checkout@v7
2626
with:
2727
fetch-depth: 0
2828

.github/workflows/code-check.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
build:
1717
runs-on: ubuntu-latest
1818
steps:
19-
- uses: actions/checkout@v6
19+
- uses: actions/checkout@v7
2020
- uses: actions/setup-node@v6
2121
with:
2222
# Use node version from '.nvmrc' instead of hardcoding here
@@ -31,5 +31,3 @@ jobs:
3131
run: npm run check:lint
3232
- name: Check for TS issues
3333
run: npm run check:types
34-
- name: Run tests
35-
run: npm run test

.github/workflows/crowdin-pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030
uses: Chia-Network/actions/git-mark-workspace-safe@main
3131

3232
- name: Checkout
33-
uses: actions/checkout@v6
33+
uses: actions/checkout@v7
3434
with:
3535
ref: "${{ inputs.pr_target || github.ref_name }}"
3636

.github/workflows/crowdin-push.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
container: node:24
1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v6
19+
uses: actions/checkout@v7
2020

2121
- name: Vault Login
2222
uses: Chia-Network/actions/vault/login@main

.github/workflows/dependency-cursor-review.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ permissions:
2929

3030
jobs:
3131
dependency-review:
32-
if: github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'renovate[bot]'))
32+
if: github.repository_owner == 'Chia-Network' && (github.event_name == 'workflow_dispatch' || (github.event_name == 'pull_request' && (github.event.pull_request.user.login == 'dependabot[bot]' || github.event.pull_request.user.login == 'renovate[bot]')))
3333
runs-on: ubuntu-latest
3434
timeout-minutes: 15
3535
steps:
@@ -72,7 +72,7 @@ jobs:
7272
core.setOutput('head_sha', pr.head?.sha || '');
7373
7474
- name: Checkout repository
75-
uses: actions/checkout@v6
75+
uses: actions/checkout@v7
7676
with:
7777
ref: ${{ steps.target_pr.outputs.head_sha }}
7878
persist-credentials: false
@@ -242,7 +242,7 @@ jobs:
242242
run: mkdir -p ".upstream-dependency"
243243

244244
- name: Checkout upstream repository
245-
uses: actions/checkout@v6
245+
uses: actions/checkout@v7
246246
with:
247247
repository: ${{ steps.dependabot_context.outputs.upstream_repo }}
248248
path: .upstream-dependency

.github/workflows/dependency-review.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ jobs:
1717
runs-on: ubuntu-latest
1818
steps:
1919
- name: "Checkout Repository"
20-
uses: actions/checkout@v6
20+
uses: actions/checkout@v7
2121

2222
- name: "Dependency Review"
23-
uses: actions/dependency-review-action@v4
23+
uses: actions/dependency-review-action@v5.0.0
2424
with:
2525
allow-dependencies-licenses: pkg:pypi/pyinstaller
2626
deny-licenses: AGPL-1.0-only, AGPL-1.0-or-later, AGPL-1.0-or-later, AGPL-3.0-or-later, GPL-1.0-only, GPL-1.0-or-later, GPL-2.0-only, GPL-2.0-or-later, GPL-3.0-only, GPL-3.0-or-later

.github/workflows/extract-strings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
runs-on: ubuntu-latest
2222
steps:
2323
- name: Checkout Code
24-
uses: actions/checkout@v6
24+
uses: actions/checkout@v7
2525
with:
2626
fetch-depth: 0
2727
token: ${{ secrets.REPO_COMMIT }}

.github/workflows/test.yml

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: test
2+
on:
3+
push:
4+
branches:
5+
- long_lived/**
6+
- main
7+
- release/**
8+
tags:
9+
- "**"
10+
pull_request:
11+
branches:
12+
- "**"
13+
# Allows you to run this workflow manually from the Actions tab
14+
workflow_dispatch:
15+
jobs:
16+
test:
17+
runs-on: ubuntu-latest
18+
steps:
19+
- uses: actions/checkout@v6
20+
- uses: actions/setup-node@v6
21+
with:
22+
# Use node version from '.nvmrc' instead of hardcoding here
23+
node-version-file: ".nvmrc"
24+
- name: npm ci
25+
run: npm ci
26+
- name: npm run build:ci
27+
run: npm run build:ci
28+
- name: Run tests
29+
run: npm run test

0 commit comments

Comments
 (0)