Merge pull request #45 from GalaxyPay/dev

refine status button menu
GalaxyPay · Jan 8, 2025 · a1fbfdb · a1fbfdb
2 parents fb19b17 + 60ebc32
commit a1fbfdb
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 11 deletions.
diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.0.3
+          tag: v3.0.4
           artifacts: "Output/*"
diff --git 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 "3.0.3"
+#define MyAppVersion "3.0.4"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

diff --git a/create-package-deb.sh b/create-package-deb.sh
@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.0.3_linux-$1
+PKG=Output/func_3.0.4_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
@@ -5,4 +5,4 @@ pkgbuild --root publish \
     --install-location /opt/func \
     --scripts pkg/scripts \
     --identifier func.app \
-    Output/func_3.0.3_darwin-$1.pkg
+    Output/func_3.0.4_darwin-$1.pkg
diff --git a/deb/amd64/control b/deb/amd64/control
@@ -1,5 +1,5 @@
 Package: func
-Version: 3.0.3
+Version: 3.0.4
 Section: base
 Priority: optional
 Architecture: amd64

diff --git a/deb/arm64/control b/deb/arm64/control
@@ -1,5 +1,5 @@
 Package: func
-Version: 3.0.3
+Version: 3.0.4
 Section: base
 Priority: optional
 Architecture: arm64

diff --git a/webui/package.json b/webui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "3.0.3",
+  "version": "3.0.4",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

diff --git a/webui/src/components/Participation.vue b/webui/src/components/Participation.vue
@@ -26,15 +26,33 @@
         <template #[`item.status`]="{ item }">
           <v-btn variant="flat" size="small">
             <span>
-              <v-badge floating dot :color="keyStatus(item).color" />
-              <v-icon :icon="mdiChevronDown" class="ml-2" size="large" />
+              <v-badge
+                floating
+                dot
+                :color="keyStatus(item).color"
+                class="mr-2"
+              />
+              <v-icon
+                v-show="
+                  activeAccount?.address === item.address || !isKeyActive(item)
+                "
+                :icon="mdiChevronDown"
+                size="large"
+              />
             </span>
             <v-tooltip
               activator="parent"
               location="top"
               :text="keyStatus(item).text"
             />
-            <v-menu activator="parent" bottom scrim>
+            <v-menu
+              activator="parent"
+              :disabled="
+                activeAccount?.address !== item.address && isKeyActive(item)
+              "
+              bottom
+              scrim
+            >
               <v-list density="compact">
                 <v-list-item
                   :title="(isKeyActive(item) ? 'Re-' : '') + 'Register'"
@@ -47,7 +65,9 @@
                 <v-list-item
                   title="Go Offline"
                   @click="offline()"
-                  v-show="isKeyActive(item)"
+                  v-show="
+                    activeAccount?.address === item.address && isKeyActive(item)
+                  "
                 />
                 <v-list-item
                   title="Delete Key"