diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml index 99e2391..8a79b69 100644 --- a/.github/workflows/go.yml +++ b/.github/workflows/go.yml @@ -266,5 +266,5 @@ jobs: uses: ncipollo/release-action@v1 with: allowUpdates: true - tag: v2.2.2 + tag: v2.2.3 artifacts: "Output/*" diff --git a/FUNC.iss b/FUNC.iss index dcb7a26..44b3abe 100644 --- a/FUNC.iss +++ b/FUNC.iss @@ -2,7 +2,7 @@ ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! #define MyAppName "FUNC" -#define MyAppVersion "2.2.2" +#define MyAppVersion "2.2.3" #define MyAppPublisher "Galaxy Pay, LLC" #define MyAppPublisherURL "https://galaxy-pay.com" #define MyPublishPath "publish" diff --git a/FUNC/Utils.cs b/FUNC/Utils.cs index c8664a4..7c4d75f 100644 --- a/FUNC/Utils.cs +++ b/FUNC/Utils.cs @@ -40,7 +40,7 @@ public static string ParseServiceStatus(string sc) string status = "Unknown"; if (IsWindows()) { - if (sc.Contains("OpenService FAILED")) { status = "Not Found"; } + if (sc.Contains("1060:")) { status = "Not Found"; } else if (sc.Contains("1 STOPPED")) { status = "Stopped"; } else if (sc.Contains("4 RUNNING")) { status = "Running"; } } diff --git a/create-package-deb.sh b/create-package-deb.sh index a47a4ac..fc318a8 100755 --- a/create-package-deb.sh +++ b/create-package-deb.sh @@ -1,6 +1,6 @@ rm -r Output -PKG=Output/func_2.2.2_linux-$1 +PKG=Output/func_2.2.3_linux-$1 mkdir -p $PKG/lib/systemd/system mkdir -p $PKG/opt/func diff --git a/create-package-pkg.sh b/create-package-pkg.sh index 983b701..ee21c58 100755 --- a/create-package-pkg.sh +++ b/create-package-pkg.sh @@ -5,4 +5,4 @@ pkgbuild --root publish \ --install-location /opt/func \ --scripts pkg/scripts \ --identifier func.app \ - Output/func_2.2.2_darwin-$1.pkg + Output/func_2.2.3_darwin-$1.pkg diff --git a/deb/amd64/control b/deb/amd64/control index 7e82b6d..7721cdd 100644 --- a/deb/amd64/control +++ b/deb/amd64/control @@ -1,5 +1,5 @@ Package: func -Version: 2.2.2 +Version: 2.2.3 Section: base Priority: optional Architecture: amd64 diff --git a/deb/arm64/control b/deb/arm64/control index 49c5b88..a208725 100644 --- a/deb/arm64/control +++ b/deb/arm64/control @@ -1,5 +1,5 @@ Package: func -Version: 2.2.2 +Version: 2.2.3 Section: base Priority: optional Architecture: arm64 diff --git a/webui/package.json b/webui/package.json index d8bb15f..0cb2940 100644 --- a/webui/package.json +++ b/webui/package.json @@ -1,6 +1,6 @@ { "name": "func-webui", - "version": "2.2.2", + "version": "2.2.3", "scripts": { "dev": "vite", "build": "vue-tsc --noEmit && vite build", diff --git a/webui/src/components/Node.vue b/webui/src/components/Node.vue index a47f155..49bfa8c 100644 --- a/webui/src/components/Node.vue +++ b/webui/src/components/Node.vue @@ -223,14 +223,23 @@ const retiUpdate = computed(() => { const isSyncing = computed(() => !!algodStatus.value?.["catchup-time"]); const createdColor = computed(() => - nodeStatus.value?.serviceStatus !== "Not Found" ? "success" : "red" + nodeStatus.value?.serviceStatus === "Unknown" + ? "grey" + : nodeStatus.value?.serviceStatus !== "Not Found" + ? "success" + : "red" ); + const runningColor = computed(() => nodeStatus.value?.serviceStatus === "Running" ? "success" : "red" ); const syncedColor = computed(() => - isSyncing.value && !generatingKey.value ? "warning" : runningColor.value + algodStatus.value?.["last-round"] == 0 + ? "red" + : isSyncing.value && !generatingKey.value + ? "warning" + : runningColor.value ); const participatingColor = computed(() =>