Merge pull request #72 from edenia/dev

Merge dev to main.
edenia · Jan 6, 2023 · e3b82bb · e3b82bb
2 parents 7cea221 + 35d8fb3
commit e3b82bb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/.github/workflows/push-dev-environment.yaml b/.github/workflows/push-dev-environment.yaml
@@ -491,7 +491,7 @@ jobs:
                   NEXT_PUBLIC_EOS_RPC_HOST: jungle4.api.eosnation.io
                   NEXT_PUBLIC_EOS_RPC_PORT: 443
                   NEXT_PUBLIC_EOS_READ_RPC_URLS: https://jungle4.api.eosnation.io
-                  NEXT_PUBLIC_TABLE_ROWS_MAX_FETCH_PER_SEC: 10
+                  NEXT_PUBLIC_TABLE_ROWS_MAX_FETCH_PER_SEC: 20
                   NEXT_PUBLIC_EDEN_CONTRACT_ACCOUNT: genesis.eden
                   NEXT_PUBLIC_AA_FETCH_AFTER: 35955488
                   NEXT_PUBLIC_TOKEN_CONTRACT: eosio.token

diff --git a/.github/workflows/push-pdn-environment.yaml b/.github/workflows/push-pdn-environment.yaml
@@ -491,7 +491,7 @@ jobs:
                   NEXT_PUBLIC_EOS_RPC_HOST: api.eosn.io
                   NEXT_PUBLIC_EOS_RPC_PORT: 443
                   NEXT_PUBLIC_EOS_READ_RPC_URLS: https://api.eosn.io,https://eos.greymass.com
-                  NEXT_PUBLIC_TABLE_ROWS_MAX_FETCH_PER_SEC: 10
+                  NEXT_PUBLIC_TABLE_ROWS_MAX_FETCH_PER_SEC: 20
                   NEXT_PUBLIC_EDEN_CONTRACT_ACCOUNT: genesis.eden
                   NEXT_PUBLIC_AA_FETCH_AFTER: 1619827201000
                   NEXT_PUBLIC_TOKEN_CONTRACT: eosio.token

diff --git a/packages/webapp/src/treasury/components/treasury-disbursements-info.tsx b/packages/webapp/src/treasury/components/treasury-disbursements-info.tsx
@@ -1,10 +1,17 @@
 import dayjs from "dayjs";
 
 import { tokenConfig } from "config";
-import { Container, Heading, Text, useDistributionState } from "_app";
+import {
+    Container,
+    Heading,
+    Text,
+    useDistributionState,
+    useMasterPool,
+} from "_app";
 
 export const TreasuryDisbursementsInfo = () => {
     const { data: distributionState } = useDistributionState();
+    const { data: pool } = useMasterPool();
 
     const nextDisbursementTime =
         distributionState &&
@@ -19,10 +26,12 @@ export const TreasuryDisbursementsInfo = () => {
                 {tokenConfig.symbol} accounts.
             </Text>
             <Text>
-                The overall disbursement is equal to 15% of the Eden treasury at
-                the time of disbursement. The amount is then divided equally
-                among the representative levels. At each level, the amount is
-                further divided equally among that level's representatives.
+                The overall disbursement is equal to{" "}
+                {pool?.monthly_distribution_pct || "..."}% of the Eden treasury
+                at at the time of disbursement. The amount is then divided
+                equally among the representative levels. At each level, the
+                amount is further divided equally among that level's
+                representatives.
             </Text>
             {nextDisbursementTime && (
                 <Text>