merge: resolve conflicts

package.json

@@ -1,7 +1,7 @@
 {
     "name": "tari-universe",
     "private": true,
-    "version": "0.9.809",
+    "version": "0.9.810",
     "type": "module",
     "scripts": {
         "dev": "vite dev --mode development",
@@ -70,4 +70,4 @@
         "typescript-eslint": "^8.25.0",
         "vite": "^6.2.0"
     }
-}
+}

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.9.809"
+version = "0.9.810"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

src-tauri/binaries_versions_esmeralda.json

@@ -1,11 +1,11 @@
 {
     "binaries": {
         "xmrig": "=6.22.0",
-        "mmproxy": "=1.11.4-pre.0",
-        "minotari_node": "=1.11.5-pre.0",
-        "wallet": "=1.11.4-pre.0",
-        "sha-p2pool": "=0.22.2",
-        "xtrgpuminer": "=0.2.12",
+        "mmproxy": "=1.11.6-pre.0",
+        "minotari_node": "=1.11.6-pre.0",
+        "wallet": "=1.11.6-pre.0",
+        "sha-p2pool": "=0.22.3",
+        "xtrgpuminer": "=0.2.14",
         "tor": "=13.5.7"
     }
 }

src-tauri/binaries_versions_nextnet.json

@@ -1,11 +1,11 @@
 {
     "binaries": {
         "xmrig": "=6.22.0",
-        "mmproxy": "=1.11.4-rc.0",
-        "minotari_node": "=1.11.5-rc.0",
-        "wallet": "=1.11.4-rc.0",
-        "sha-p2pool": "=0.22.2",
-        "xtrgpuminer": "=0.2.12",
+        "mmproxy": "=1.11.6-rc.0",
+        "minotari_node": "=1.11.6-rc.0",
+        "wallet": "=1.11.6-rc.0",
+        "sha-p2pool": "=0.22.3",
+        "xtrgpuminer": "=0.2.14",
         "tor": "=13.5.7"
     }
 }

src-tauri/tauri.conf.json

@@ -1,5 +1,5 @@
 {
-    "version": "0.9.809",
+    "version": "0.9.810",
     "productName": "Tari Universe (Alpha)",
     "mainBinaryName": "Tari Universe (Alpha)",
     "identifier": "com.tari.universe.alpha",

src/store/actions/appConfigStoreActions.ts

@@ -228,11 +228,16 @@ export const setTheme = async (themeArg: displayMode) => {
     const uiTheme = display_mode === 'system' ? (prefersDarkMode() ? 'dark' : 'light') : display_mode;
     setUITheme(uiTheme);
     useAppConfigStore.setState({ display_mode });
-    invoke('set_display_mode', { displayMode: display_mode as displayMode }).catch((e) => {
-        console.error('Could not set theme', e);
-        setError('Could not change theme');
-        useAppConfigStore.setState({ display_mode: prevTheme });
-    });
+    const shouldUpdateConfigTheme = display_mode !== prevTheme;
+
+    if (shouldUpdateConfigTheme) {
+        invoke('set_display_mode', { displayMode: display_mode as displayMode }).catch((e) => {
+            console.error('Could not set theme', e);
+            setError('Could not change theme');
+            useAppConfigStore.setState({ display_mode: prevTheme });
+            if (prevTheme) setUITheme(prevTheme === 'system' ? (prefersDarkMode() ? 'dark' : 'light') : prevTheme);
+        });
+    }
 };
 export const setUseTor = async (useTor: boolean) => {
     useAppConfigStore.setState({ use_tor: useTor });