Skip to content

Commit 6235f6b

Browse files
committed
Merge branch 'main' of github.com:FuelLabs/fuel-explorer into lf/feat/migrate-fuel-ui
2 parents 906215f + 2bc3ba4 commit 6235f6b

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

.github/workflows/helm-publish.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
uses: bsord/helm-push@v4.1.0
3030
with:
3131
useOCIRegistry: true
32-
registry-url: oci://ghcr.io/fuellabs/helmrelease
32+
registry-url: oci://ghcr.io/fuellabs/helmcharts
3333
username: ${{ github.repository_owner }}
3434
access-token: ${{ secrets.GITHUB_TOKEN }}
3535
force: true

helm/fuel-explorer/Chart.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ type: application
1515
# This is the chart version. This version number should be incremented each time you make changes
1616
# to the chart and its templates, including the app version.
1717
# Versions are expected to follow Semantic Versioning (https://semver.org/)
18-
version: 0.1.1
18+
version: 0.1.3
1919

2020
# This is the version number of the application being deployed. This version number should be
2121
# incremented each time you make changes to the application. Versions are not expected to
+7-5
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
apiVersion: v1
22
kind: Service
33
metadata:
4-
name: { { include "fuel-explorer.fullname" . } }
5-
labels: { { - include "fuel-explorer.labels" . | nindent 4 } }
4+
name: {{ include "fuel-explorer.fullname" . }}
5+
labels:
6+
{{- include "fuel-explorer.labels" . | nindent 4 }}
67
spec:
7-
type: { { .Values.service.type } }
8+
type: {{ .Values.service.type }}
89
ports:
9-
- port: { { .Values.service.port } }
10+
- port: {{ .Values.service.port }}
1011
targetPort: http
1112
protocol: TCP
1213
name: http
13-
selector: { { - include "fuel-explorer.selectorLabels" . | nindent 4 } }
14+
selector:
15+
{{- include "fuel-explorer.selectorLabels" . | nindent 4 }}

packages/app-explorer/src/systems/Core/components/JsonViewer/JsonViewer.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { BaseProps } from '@fuels/ui';
2-
import { cx, useRadixTheme } from '@fuels/ui';
2+
import { cx, useTheme } from '@fuels/ui';
33
import {
44
JsonView,
55
collapseAllNested,
@@ -14,14 +14,14 @@ export type JsonViewerProps = BaseProps<{
1414

1515
export function JsonViewer({ data, className, ...props }: JsonViewerProps) {
1616
const classes = styles();
17-
const ctx = useRadixTheme();
17+
const { theme } = useTheme();
1818
return (
1919
<JsonView
2020
data={data}
2121
shouldExpandNode={collapseAllNested}
2222
style={
2323
{
24-
...(ctx.appearance === 'dark' ? darkStyles : defaultStyles),
24+
...(theme === 'dark' ? darkStyles : defaultStyles),
2525
container: cx(classes.json(), className),
2626
// eslint-disable-next-line @typescript-eslint/no-explicit-any
2727
} as any

packages/ui/src/components/Theme/useTheme.tsx

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,13 @@ import { updateThemeAppearanceClass, useThemeContext } from '@radix-ui/themes';
55
import { changeStorageTheme, getNextTheme, getStorageTheme } from './storage';
66

77
export function useTheme() {
8-
const { appearance: theme } = useThemeContext();
8+
const { appearance: theme, onAppearanceChange } = useThemeContext();
99

1010
function toggleTheme() {
1111
const current = getStorageTheme();
1212
const next = getNextTheme(current);
1313
updateThemeAppearanceClass(next);
14+
onAppearanceChange(next);
1415
changeStorageTheme(next);
1516
}
1617

0 commit comments

Comments
 (0)