From e1c23eb3d9b07a19a5e9fe99a090344604428821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C5=91rik=20Levente?=
 <33373714+Levminer@users.noreply.github.com>
Date: Sat, 20 Jul 2024 21:04:58 +0200
Subject: [PATCH] Connection and settings fixes

---
 .../interface/ui/pages/connections.svelte     |  7 ++++-
 platforms/interface/ui/pages/gpu.svelte       |  8 ++---
 platforms/interface/ui/pages/settings.svelte  | 30 +++++++++++--------
 3 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/platforms/interface/ui/pages/connections.svelte b/platforms/interface/ui/pages/connections.svelte
index 0655edb..b6fa5fb 100644
--- a/platforms/interface/ui/pages/connections.svelte
+++ b/platforms/interface/ui/pages/connections.svelte
@@ -42,7 +42,11 @@
 						<button
 							class="button"
 							on:click={() => {
-								open(`https://cores.levminer.com/settings?connectionCode=${$settings.connectionCode}`)
+								open(
+									`https://cores.levminer.com/settings?connectionCode=${$settings.connectionCode}&mac=${
+										$hardwareInfo.system.network.interfaces[0]?.macAddress ?? ""
+									}`,
+								)
 							}}
 						>
 							<ExternalLink />
@@ -61,6 +65,7 @@
 	import { settings } from "ui/stores/settings.ts"
 	import { invoke } from "@tauri-apps/api/core"
 	import { open } from "@tauri-apps/plugin-shell"
+	import { hardwareInfo } from "../stores/hardwareInfo.ts"
 
 	const remoteConnections = () => {
 		invoke("restart_service")
diff --git a/platforms/interface/ui/pages/gpu.svelte b/platforms/interface/ui/pages/gpu.svelte
index ce6f29b..158078d 100644
--- a/platforms/interface/ui/pages/gpu.svelte
+++ b/platforms/interface/ui/pages/gpu.svelte
@@ -14,7 +14,10 @@
 					<h3>Name: {$hardwareInfo.gpu.name ?? "N/A"}</h3>
 					<h3>GPU memory: {$hardwareInfo.gpu.memory.length > 2 ? Math.round($hardwareInfo.gpu.memory[2]?.value ?? 0) : "N/A"} GB</h3>
 					<h3>Driver date: {$hardwareInfo.gpu.info}</h3>
-					<h3>Primary monitor: {primaryMonitor?.resolution ?? "N/A"} {primaryMonitor?.refreshRate ?? "N/A"} Hz</h3>
+					<h3>
+						Primary monitor: {$hardwareInfo.system.monitor.monitors.find((monitor) => monitor.primary)?.resolution ?? "N/A"}
+						{$hardwareInfo.system.monitor.monitors.find((monitor) => monitor.primary)?.refreshRate ?? "N/A"} Hz
+					</h3>
 				</div>
 			</div>
 
@@ -258,7 +261,4 @@
 	import ToggleButton from "ui/components/toggleButton.svelte"
 
 	let minutes = false
-
-	// get primary monitor
-	let primaryMonitor = $hardwareInfo.system.monitor.monitors.find((monitor) => monitor.primary)
 </script>
diff --git a/platforms/interface/ui/pages/settings.svelte b/platforms/interface/ui/pages/settings.svelte
index 149d2bc..632ad9b 100644
--- a/platforms/interface/ui/pages/settings.svelte
+++ b/platforms/interface/ui/pages/settings.svelte
@@ -133,25 +133,29 @@
 			fullVersionList?: { version: string }[]
 		}
 
-		let chromium_version = "N/A"
+		let runtimeVersion = "N/A"
 
-		// @ts-ignore
-		const ua: userAgentData = await navigator.userAgentData.getHighEntropyValues([
-			"architecture",
-			"model",
-			"platform",
-			"platformVersion",
-			"fullVersionList",
-		])
-
-		if (ua.fullVersionList !== undefined && ua.fullVersionList.length > 0) {
+		try {
 			// @ts-ignore
-			chromium_version = ua.fullVersionList.filter((item) => item.brand === "Chromium")[0]?.version || "N/A"
+			const ua: userAgentData = await navigator.userAgentData.getHighEntropyValues([
+				"architecture",
+				"model",
+				"platform",
+				"platformVersion",
+				"fullVersionList",
+			])
+
+			if (ua.fullVersionList !== undefined && ua.fullVersionList.length > 0) {
+				// @ts-ignore
+				runtimeVersion = ua.fullVersionList.filter((item) => item.brand === "Chromium")[0]?.version || "N/A"
+			}
+		} catch (error) {
+			console.log(error)
 		}
 
 		const systemInfo: SystemInfo = await invoke("system_info")
 
-		let dialogMessage = `Cores: ${build.version} \n\nTauri: ${systemInfo.tauriVersion} \nChromium: ${chromium_version}\n\nOS version: ${
+		let dialogMessage = `Cores: ${build.version} \n\nTauri: ${systemInfo.tauriVersion} \nRuntime: ${runtimeVersion}\n\nOS version: ${
 			$hardwareInfo.system.os.name
 		} \nHardware info: ${$hardwareInfo.cpu.name} ${Math.round(systemInfo.totalMem / 1024 / 1024 / 1024)} GB RAM\n\nRelease date: ${
 			build.date