Merge pull request #41 from signum-network/develop

Develop

Author: jjos2372

react-pool/public/assets/locales/de/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Deutsch",
   "chooseLanguage": "Wählen Sie eine Sprache",
   "noBlocksWon": "Es sind keine Blöcke gewonnen, holen Sie sie!",
-  "processing": "Wird bearbeitet..."
+  "processing": "Wird bearbeitet...",
+  "graceDeadline": "Gnadenfristen"
 }

react-pool/public/assets/locales/en/translation.json

@@ -53,6 +53,7 @@
   "nBlocksAverage": "Number of blocks for averages",
   "nBlocksToShowMiner": "Number of blocks to show a Miner",
   "maxDeadline": "Max Deadline",
+  "graceDeadline": "Grace deadlines",
   "processLag": "Process Lag",
   "feeRecipient": "Fee Recipient",
   "poolFee": "Pool Fee",

react-pool/public/assets/locales/es/translation.json

@@ -92,7 +92,7 @@
   "poolPhysical": "Tamaño físico",
   "poolShare": "Pool Share",
   "poolSoloFee": "Tarifa para minero en \"Solo mining\"",
-  "poolVersion": "Versión del pool",
+  "poolVersion": "Versión de la pool",
   "price": "Precio",
   "processLag": "Process Lag",
   "rewardAndFees": "Recompensa + Tarifas",
@@ -138,5 +138,6 @@
   "languageName": "Español",
   "chooseLanguage": "Elija un idioma",
   "noBlocksWon": "No hay bloques ganados, ¡ve por ellos!",
-  "processing": "Procesando..."
-}
+  "processing": "Procesando...",
+  "graceDeadline": "Deadlines fallidos sin penalización"
+}

react-pool/public/assets/locales/fr/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Français",
   "chooseLanguage": "Choisissez une langue",
   "noBlocksWon": "Il n'y a pas de blocs gagnés, allez les chercher !",
-  "processing": "Traitement..."
+  "processing": "Traitement...",
+  "graceDeadline": "Délais de grâce"
 }

react-pool/public/assets/locales/it/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Italiano",
   "chooseLanguage": "Scegli una lingua",
   "noBlocksWon": "Non ci sono blocchi vinti, andate a prenderli!",
-  "processing": "In lavorazione..."
+  "processing": "In lavorazione...",
+  "graceDeadline": "Scadenze di grazia"
 }

react-pool/public/assets/locales/kr/translation.json

@@ -53,6 +53,7 @@
   "nBlocksAverage": "평균 블록 수",
   "nBlocksToShowMiner": "광부를 보여줄 블록 수",
   "maxDeadline": "최대 기한",
+  "graceDeadline": "유예 마감",
   "processLag": "프로세스 지연",
   "feeRecipient": "수수료 수령인",
   "poolFee": "풀 요금",

react-pool/public/assets/locales/nl/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Nederlands",
   "chooseLanguage": "Kies een taal",
   "noBlocksWon": "Er zijn geen blokken gewonnen, ga ze halen!",
-  "processing": "Verwerken..."
+  "processing": "Verwerken...",
+  "graceDeadline": "Grace deadlines"
 }

react-pool/public/assets/locales/pl/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Polskie",
   "chooseLanguage": "Wybierz język",
   "noBlocksWon": "Nie ma wygranych bloków, zdobądź je!",
-  "processing": "Przetwarzanie..."
+  "processing": "Przetwarzanie...",
+  "graceDeadline": "Terminy łaski"
 }

react-pool/public/assets/locales/pt/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Português",
   "chooseLanguage": "Escolha um idioma",
   "noBlocksWon": "Não há blocos ganhos, vá pegá-los!",
-  "processing": "Em processamento..."
-}
+  "processing": "Em processamento...",
+  "graceDeadline": "Deadlines perdidas sem penalização"
+}

react-pool/public/assets/locales/ru/translation.json

@@ -138,5 +138,6 @@
   "languageName": "русский",
   "chooseLanguage": "Выберите язык",
   "noBlocksWon": "Нет выигранных блоков, идите и возьмите их!",
-  "processing": "Обработка..."
+  "processing": "Обработка...",
+  "graceDeadline": "Сроки отсрочки"
 }

react-pool/public/assets/locales/tr/translation.json

@@ -138,5 +138,6 @@
   "languageName": "Türk",
   "chooseLanguage": "Bir Dil Seçin",
   "noBlocksWon": "Kazanılan blok yok, git onları al!",
-  "processing": "İşleme..."
+  "processing": "İşleme...",
+  "graceDeadline": "Ek süreler"
 }

react-pool/public/assets/locales/zh/translation.json

@@ -66,7 +66,7 @@
   "minerOptionsAlert": "如果你想要更改矿工设置，请发送<1>未加密信息</1>",
   "miners": "矿工",
   "minimumPayout": "最小起付额",
-  "minimumPayoutParagraph": "通过发送以下文本消息将您的最低起付金额更改为100 SIGNA（接受任何高于{minimumPayoutCount}}的数值）</1>：",
+  "minimumPayoutParagraph": "通过发送以下文本消息将您的最低起付金额更改为100 SIGNA（接受任何高于{{minimumPayoutCount}}的数值）</1>：",
   "minimumPayoutsAtOnce": "一次性最小支付笔数",
   "missingDetails": "缺少信息，请联系操作人员",
   "nBlocksAverage": "平均区块数量",
@@ -138,5 +138,6 @@
   "languageName": "普通话",
   "chooseLanguage": "选择语言",
   "noBlocksWon": "没有赢得块，去拿它们！",
-  "processing": "加工..."
-}
+  "processing": "加工...",
+  "graceDeadline": "宽限期"
+}

react-pool/public/index.html

@@ -82,15 +82,15 @@
 
     <!-- Open Graph / Facebook -->
     <meta property="og:type" content="website" />
-    <meta property="og:url" content="%PUBLIC_URL%" />
     <meta property="og:title" content="{TITLE}" />
     <meta property="og:description" content="{SEODESCRIPTION}" />
     <meta property="og:image" content="{SEOIMGURL}" />
+    <meta property="og:url" content="{PAGEURL}" />
 
     <!-- Twitter -->
     <meta property="twitter:card" content="summary_large_image" />
-    <meta property="twitter:url" content="%PUBLIC_URL%" />
     <meta property="twitter:title" content="{TITLE}" />
+    <meta property="twitter:url" content="{PAGEURL}" />
 
     <meta property="twitter:description" content="{SEODESCRIPTION}" />
     <meta property="twitter:image" content="{SEOIMGURL}" />

react-pool/src/Routes.js

@@ -130,6 +130,11 @@ const Routes = (props) => {
     }
   }, [initialized, location]);
 
+  // Listen to route changes
+  useEffect(() => {
+    window.scrollTo(0, 0);
+  }, [location]);
+
   return (
     <Fragment>
       {/* Miner modal */}

react-pool/src/components/UI/minersTable/index.js

@@ -101,17 +101,19 @@ const StickyHeadTable = (props) => {
       format: (value) => value.toFixed(2),
     },
     {
-      id: "Software",
-      minWidth: 150,
+      id: "shareModel",
+      minWidth: 75,
       align: "center",
-      format: (value) => value.toFixed(2),
-    },
-    {
-      id: "Actions",
-      minWidth: 150,
-      align: "center",
-      format: (value) => value.toFixed(2),
+      format: (value) => value.toLocaleString("en-US"),
     },
+
+    // Optional actions button
+    // {
+    //   id: "Actions",
+    //   minWidth: 150,
+    //   align: "center",
+    //   format: (value) => value.toFixed(2),
+    // },
   ];
 
   // Mobile columns
@@ -129,7 +131,7 @@ const StickyHeadTable = (props) => {
     nativeColumns[2],
 
     // View more
-    nativeColumns[10],
+    // nativeColumns[10],
   ];
 
   // Columns that website will use
@@ -263,6 +265,10 @@ const StickyHeadTable = (props) => {
                             {cellValue}
                           </Typography>
                         );
+
+                        // Check if column is share model
+                      } else if (column.id === "shareModel") {
+                        cellContent = row.data.sharePercent + "%";
                       }
 
                       return (

react-pool/src/components/UI/outlinedTable/index.js

@@ -52,6 +52,14 @@ const OutLinedTable = (props) => {
               ? item.onClick
               : null;
 
+          // Check if user has dynamic onClick, but in the value column
+          const onClickValueAction =
+            item.onClickValue &&
+            item.onClickValue !== null &&
+            item.onClickValue !== undefined
+              ? item.onClickValue
+              : null;
+
           return (
             <Grid container item className={styles.tableItem} key={key}>
               <Grid
@@ -68,10 +76,15 @@ const OutLinedTable = (props) => {
                   <Typography component="span">{item.sTitle}</Typography>
                 ) : null}
               </Grid>
+
               <Grid
                 item
                 className={styles.tableItemRightSide}
-                style={{ width: props.sWidth }}
+                style={{
+                  width: props.sWidth,
+                  cursor: onClickValueAction ? "pointer" : null,
+                }}
+                onClick={onClickValueAction}
               >
                 <Typography>{item.value}</Typography>
               </Grid>

react-pool/src/pages/home/index.js

@@ -40,6 +40,7 @@ import {
 } from "../../utils/globalParameters";
 
 import { thousands_separators } from "../../utils/functions/normal";
+import { openAccountInExplorer } from "../../utils/functions/blockchain";
 
 // Components
 import MinersTable from "../../components/UI/minersTable/index";
@@ -225,7 +226,20 @@ const Home = (props) => {
     bookMarkedMiner.data.map((item) => {
       // Check if item exist
       if (item && item !== null && item !== undefined) {
-        return dataToRender.push({ ...item, title: t(item.title) });
+        // Key item
+        const key = item.title;
+
+        // Properties to add
+        let objectProperties = { ...item, title: t(key) };
+
+        // Check if items are username or address
+        if (key === "username" || key === "minerAddress") {
+          objectProperties.onClickValue = () => {
+            openAccountInExplorer(item.id);
+          };
+        }
+
+        return dataToRender.push(objectProperties);
       }
     });
 

react-pool/src/pages/pool-info/index.js

@@ -33,7 +33,10 @@ import MinerOptions from "../../components/pages/poolInfo/minerOption/index";
 
 // Extra
 import { thousands_separators } from "../../utils/functions/normal";
-import { formatTime } from "../../utils/functions/blockchain";
+import {
+  formatTime,
+  openAccountInExplorer,
+} from "../../utils/functions/blockchain";
 
 // Third-party
 import { isMobile } from "react-device-detect";
@@ -171,6 +174,9 @@ const PoolInfo = (props) => {
           title: t("poolAccount"),
           value: poolData.data.poolAccountRS,
           type: "info",
+          onClickValue: () => {
+            openAccountInExplorer(poolData.data.poolAccountId);
+          },
         },
         {
           title: t("nBlocksAverage"),
@@ -187,6 +193,11 @@ const PoolInfo = (props) => {
           value: poolData.data.maxDeadline,
           type: "info",
         },
+        {
+          title: t("graceDeadline"),
+          value: poolData.data.graceDeadlines || "",
+          type: "info",
+        },
 
         {
           title: t("processLag"),
@@ -197,6 +208,9 @@ const PoolInfo = (props) => {
           title: t("feeRecipient"),
           value: poolData.data.feeRecipientRS,
           type: "info",
+          onClickValue: () => {
+            openAccountInExplorer(poolData.data.feeRecipientId);
+          },
         },
         {
           title: t("poolFee"),
@@ -213,6 +227,9 @@ const PoolInfo = (props) => {
           title: t("donationRecipient"),
           value: poolData.data.donationRecipientRS,
           type: "info",
+          onClickValue: () => {
+            openAccountInExplorer(poolData.data.donationRecipientId);
+          },
         },
         {
           title: t("defaultDonation"),

react-pool/src/utils/functions/blockchain.js

@@ -1,5 +1,5 @@
 // Here will be functions related to the blockchain
-import { genesisBaseTarget } from "../globalParameters";
+import { genesisBaseTarget, EXPLORERToUse } from "../globalParameters";
 import { thousands_separators, escapeHtml } from "./normal";
 
 // Format capacity
@@ -76,3 +76,8 @@ export const formatMinerName = (
 export const getAccountExplorerLink = (explorer, id) => {
   return explorer + id;
 };
+
+// Open explorer in a new tab
+export const openAccountInExplorer = (accountId) => {
+  window.open(`${EXPLORERToUse}?action=account&account=${accountId}`, "_blank");
+};

react-pool/src/utils/redux/actions/basicInfo.js

@@ -159,6 +159,9 @@ export const fetchPoolInfo =
             false
           );
 
+          // Pool account ID
+          responseData.poolAccountId = data.poolAccount;
+
           // Number of blocks per average
           responseData.nAvg = thousands_separators(data.nAvg);
 
@@ -168,6 +171,9 @@ export const fetchPoolInfo =
           // Max Deadline
           responseData.maxDeadline = thousands_separators(data.maxDeadline);
 
+          // Grace Deadline
+          responseData.graceDeadlines = data.graceDeadlines;
+
           // Process Lag
           responseData.processLag =
             thousands_separators(data.processLag) + ` ${t("blocks")}`;
@@ -181,6 +187,9 @@ export const fetchPoolInfo =
             false
           );
 
+          // Fee Recipient ID
+          responseData.feeRecipientId = data.feeRecipient;
+
           // Pool Fee
           responseData.poolFee =
             (parseFloat(data.poolFeePercentage) * 100).toFixed(2) + " %";
@@ -198,6 +207,9 @@ export const fetchPoolInfo =
             false
           );
 
+          // Donation Recipient ID
+          responseData.donationRecipientId = data.donationRecipient;
+
           // Donation percentage (configurable)
           responseData.donationPercent =
             parseFloat(data.donationPercent).toFixed(2) + " %";

react-pool/src/utils/redux/actions/miners.js

@@ -239,11 +239,17 @@ export const selectBookmarkedMiner =
               response.name !== null &&
               response.name !== undefined &&
               response.name.trim() !== ""
-                ? { title: "username", value: response.name, type: "info" }
+                ? {
+                    title: "username",
+                    value: response.name,
+                    id: response.address,
+                    type: "info",
+                  }
                 : null,
               {
                 title: "minerAddress",
                 value: response.addressRS,
+                id: response.address,
                 type: "info",
               },
               {