Merge pull request #54 from GalaxyPay/dev

responsive dash; ineligible reasons

.github/workflows/go.yml

@@ -266,5 +266,5 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          tag: v3.2.1
+          tag: v3.2.2
           artifacts: "Output/*"

FUNC.iss

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "FUNC"
-#define MyAppVersion "3.2.1"
+#define MyAppVersion "3.2.2"
 #define MyAppPublisher "Galaxy Pay, LLC"
 #define MyAppPublisherURL "https://galaxy-pay.com"
 #define MyPublishPath "publish"

create-package-deb.sh

@@ -1,6 +1,6 @@
 rm -r Output
 
-PKG=Output/func_3.2.1_linux-$1
+PKG=Output/func_3.2.2_linux-$1
 
 mkdir -p $PKG/lib/systemd/system
 mkdir -p $PKG/opt/func

create-package-pkg.sh

@@ -5,4 +5,4 @@ pkgbuild --root publish \
     --install-location /opt/func \
     --scripts pkg/scripts \
     --identifier func.app \
-    Output/func_3.2.1_darwin-$1.pkg
+    Output/func_3.2.2_darwin-$1.pkg

deb/amd64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.2.1
+Version: 3.2.2
 Section: base
 Priority: optional
 Architecture: amd64

deb/arm64/control

@@ -1,5 +1,5 @@
 Package: func
-Version: 3.2.1
+Version: 3.2.2
 Section: base
 Priority: optional
 Architecture: arm64

webui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "func-webui",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

webui/src/components/Node.vue

@@ -2,8 +2,8 @@
   <div v-if="nodeStatus">
     <v-progress-linear indeterminate v-show="loading" class="mb-n1" />
     <v-container class="pl-5" fluid>
-      <v-row>
-        <v-col cols="3">
+      <v-row justify="center">
+        <v-col cols="12" sm="6" md="3">
           <div class="py-1">
             <v-badge floating dot class="mx-3 mb-1" :color="createdColor" />
             Service Created
@@ -71,7 +71,7 @@
           />
         </v-col>
         <template v-if="nodeStatus.serviceStatus === 'Running'">
-          <v-col cols="3" class="text-center">
+          <v-col cols="6" md="3" class="text-center">
             <div class="text-h4" style="white-space: nowrap">
               {{
                 algodStatus
@@ -85,7 +85,7 @@
             </div>
             <div>Online Accounts</div>
           </v-col>
-          <v-col cols="3" class="text-center">
+          <v-col cols="6" md="3" class="text-center">
             <div class="text-h4">
               {{
                 partDetails?.proposals == null
@@ -113,7 +113,7 @@
             </div>
             <div>Online Stake</div>
           </v-col>
-          <v-col cols="3" class="text-center">
+          <v-col cols="6" md="3" class="text-center">
             <div class="text-h4">
               {{
                 partDetails?.votes == null
@@ -330,7 +330,8 @@ const algodClient = computed(() => {
 watch(
   () => algodStatus.value,
   (val) => {
-    if (val?.["last-round"] >= 46512890) store.isIncentiveReady = true;
+    if (props.name === "Algorand" && val?.["last-round"] >= 46512890)
+      store.isIncentiveReady = true;
   }
 );
 

webui/src/components/Participation.vue

@@ -59,7 +59,9 @@
                   @click="registerKey(item)"
                   v-show="
                     activeAccount?.address === item.address &&
-                    (!isKeyActive(item) || incentiveIneligible(item.address))
+                    (!isKeyActive(item) ||
+                      (incentiveIneligible(item.address).val &&
+                        !incentiveIneligible(item.address).reason))
                   "
                 />
                 <v-list-item
@@ -384,20 +386,24 @@ function isKeyActive(item: Participation) {
 
 function incentiveIneligible(addr: string) {
   if (!store.isIncentiveReady || activeNetwork.value !== "mainnet")
-    return false;
+    return { val: false, reason: "Not Supported" };
   const acctInfo = acctInfos.value.find((ai) => ai.address === addr);
-  return (
-    (acctInfo?.amount || 0) >= 3 * 10 ** 10 &&
-    (acctInfo?.amount || 0) < 7 * 10 ** 16 &&
-    !acctInfo?.incentiveEligible
-  );
+  if ((acctInfo?.amount || 0) < 3 * 10 ** 10)
+    return { val: true, reason: "Balance Too Low" };
+  if ((acctInfo?.amount || 0) >= 7 * 10 ** 13)
+    return { val: true, reason: "Balance Too High" };
+  return { val: !acctInfo?.incentiveEligible, reason: "" };
 }
 
 function keyStatus(item: Participation) {
+  const ii = incentiveIneligible(item.address);
   return !isKeyActive(item)
     ? { text: "Unregistered", color: "red" }
-    : incentiveIneligible(item.address)
-    ? { text: "Ineligible For Incentives", color: "warning" }
+    : ii.val
+    ? {
+        text: `Ineligible For Incentives${ii.reason ? ": " + ii.reason : ""}`,
+        color: "warning",
+      }
     : { text: "Online", color: "success" };
 }
 
@@ -467,7 +473,8 @@ async function registerKey(item: Participation) {
     store.overlay = true;
     const atc = new algosdk.AtomicTransactionComposer();
     const suggestedParams = await props.algodClient.getTransactionParams().do();
-    if (incentiveIneligible(item.address)) {
+    const ii = incentiveIneligible(item.address);
+    if (ii.val && !ii.reason) {
       suggestedParams.flatFee = true;
       suggestedParams.fee = 2 * 10 ** 6;
     }