From 89432b36ff13e99a004d6f7b5c54b7fa68d60451 Mon Sep 17 00:00:00 2001 From: brianp Date: Wed, 18 Dec 2024 17:12:36 +0100 Subject: [PATCH 1/2] Revert "fix: p2pool stats crash (#1228)" This reverts commit 045a5dd89b3ecd800d08f143859e9339ccd43f26. --- .../floating/Settings/sections/p2p/PoolMiningSettings.tsx | 6 ++---- src/store/useUIStore.ts | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/containers/floating/Settings/sections/p2p/PoolMiningSettings.tsx b/src/containers/floating/Settings/sections/p2p/PoolMiningSettings.tsx index 55920bdd4..c54dff252 100644 --- a/src/containers/floating/Settings/sections/p2p/PoolMiningSettings.tsx +++ b/src/containers/floating/Settings/sections/p2p/PoolMiningSettings.tsx @@ -1,13 +1,11 @@ +import { useState } from 'react'; import P2pMarkup from './P2pMarkup.tsx'; import P2PoolStats from './P2PoolStats.tsx'; import { useAppConfigStore } from '@app/store/useAppConfigStore'; -import { useUIStore } from '@app/store/useUIStore.ts'; export const PoolMiningSettings = () => { + const [disabledStats, setDisabledStats] = useState(false); const isP2poolEnabled = useAppConfigStore((s) => s.p2pool_enabled); - const disabledStats = useUIStore((s) => s.disabledP2poolStats); - const setDisabledStats = useUIStore((s) => s.setDisabledP2poolStats); - return ( <> diff --git a/src/store/useUIStore.ts b/src/store/useUIStore.ts index 7534f63e5..d009c181c 100644 --- a/src/store/useUIStore.ts +++ b/src/store/useUIStore.ts @@ -19,7 +19,6 @@ interface State { dialogToShow?: DialogType | null; isWebglNotSupported: boolean; adminShow?: 'setup' | 'main' | 'shutdown' | 'orphanChainWarning' | null; - disabledP2poolStats?: boolean; } interface Actions { setTheme: (theme: Theme) => void; @@ -32,7 +31,6 @@ interface Actions { setLatestVersion: (latestVersion: string) => void; setIsWebglNotSupported: (isWebglNotSupported: boolean) => void; setAdminShow: (adminShow: State['adminShow']) => void; - setDisabledP2poolStats: (disabledP2poolStats: boolean) => void; } type UIStoreState = State & Actions; @@ -46,7 +44,6 @@ const initialState: State = { dialogToShow: null, showExperimental: false, showExternalDependenciesDialog: false, - disabledP2poolStats: false, }; export const useUIStore = create()((set) => ({ @@ -67,5 +64,4 @@ export const useUIStore = create()((set) => ({ set({ isWebglNotSupported }); }, setAdminShow: (adminShow) => set({ adminShow }), - setDisabledP2poolStats: (disabledP2poolStats) => set({ disabledP2poolStats }), })); From 27e377e419fa809a522797ce56b77d18ebaa0ba4 Mon Sep 17 00:00:00 2001 From: brianp Date: Wed, 18 Dec 2024 17:13:58 +0100 Subject: [PATCH 2/2] chore: version bump 0.8.29 --- package-lock.json | 4 ++-- package.json | 2 +- src-tauri/Cargo.lock | 2 +- src-tauri/Cargo.toml | 2 +- src-tauri/tauri.conf.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 0ca9b795a..cd787f5ca 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "tari-universe", - "version": "0.8.28", + "version": "0.8.29", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "tari-universe", - "version": "0.8.28", + "version": "0.8.29", "dependencies": { "@floating-ui/react": "^0.26.28", "@lottiefiles/dotlottie-react": "^0.10.1", diff --git a/package.json b/package.json index 4be45b32a..7ef6b2859 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "tari-universe", "private": true, - "version": "0.8.28", + "version": "0.8.29", "type": "module", "scripts": { "dev": "vite dev --mode development", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 4ceeb5eea..25487bd19 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -6899,7 +6899,7 @@ dependencies = [ [[package]] name = "tari-universe" -version = "0.8.28" +version = "0.8.29" dependencies = [ "anyhow", "async-trait", diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 79223c4cc..b48b566b6 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -4,7 +4,7 @@ description = "Tari Universe" edition = "2021" name = "tari-universe" repository = "https://github.com/tari-project/universe" -version = "0.8.28" +version = "0.8.29" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 5b94edb48..54cb4b538 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -1,5 +1,5 @@ { - "version": "0.8.28", + "version": "0.8.29", "productName": "Tari Universe (Alpha)", "mainBinaryName": "Tari Universe (Alpha)", "identifier": "com.tari.universe.alpha",