fix: fix testnet config

near · Jan 19, 2022 · 5412c14 · 5412c14
1 parent f9ae81d
commit 5412c14
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/packages/frontend/src/components/staking/components/ValidatorBox.js b/packages/frontend/src/components/staking/components/ValidatorBox.js
@@ -157,6 +157,7 @@ export default function ValidatorBox({
         }
     };
     const isProjectValidator = validator.version === ValidatorVersion[PROJECT_VALIDATOR_VERSION];
+    console.log(isProjectValidator, isProjectValidator && validator);
     return (
         <Container
             className='validator-box'

diff --git a/packages/frontend/src/redux/actions/staking.js b/packages/frontend/src/redux/actions/staking.js
@@ -269,7 +269,6 @@ export const { staking } = createActions({
                     totalUnclaimed = totalUnclaimed.add(new BN(validator.unclaimed));
                     const networkId = wallet.connection.provider.connection.url.indexOf(MAINNET) > -1 ? MAINNET : TESTNET;
 
-                    console.log(networkId, validator.accountId);
                     validator.version = getValidationVersion(networkId, validator.accountId);
                 } catch (e) {
                     if (e.message.indexOf('cannot find contract code') === -1) {
@@ -419,6 +418,9 @@ export const { staking } = createActions({
                         };
                         const fee = validator.fee = await validator.contract.get_reward_fee_fraction();
                         fee.percentage = +(fee.numerator / fee.denominator * 100).toFixed(2);
+                        const networkId = wallet.connection.provider.connection.url.indexOf(MAINNET) > -1 ? MAINNET : TESTNET;
+
+                        validator.version = getValidationVersion(networkId, validator.accountId);
                         return validator;
                     } catch (e) {
                         console.warn('Error getting fee for validator %s: %s', account_id, e);

diff --git a/packages/frontend/src/translations/pt.global.json b/packages/frontend/src/translations/pt.global.json
@@ -1111,7 +1111,7 @@
             },
             "farm": {
                 "title": "Total token earned",
-                "info": "It's project validator",
+                "info": "This is project validator. You’ll get the farming reward while staking on it.",
                 "button": "Claim"
             }
         },

diff --git a/packages/frontend/src/utils/constants.js b/packages/frontend/src/utils/constants.js
@@ -2,15 +2,15 @@ export const VALIDATOR_VERSION = "VALIDATOR";
 export const PROJECT_VALIDATOR_VERSION = "PROJECT_VALIDATOR";
 
 export const ValidatorVersion = {
-  [VALIDATOR_VERSION]: 1,
-  [PROJECT_VALIDATOR_VERSION]: 2
+  [VALIDATOR_VERSION]: VALIDATOR_VERSION,
+  [PROJECT_VALIDATOR_VERSION]: PROJECT_VALIDATOR_VERSION
 };
 
 export const MAINNET = "mainnet";
 export const TESTNET = "testnet";
 export const PROJECT_VALIDATOR_PREFIX_MAINNET = ".near";
 export const VALIDATOR_PREFIX_MAINNET = ".pool.near";
-export const PROJECT_VALIDATOR_PREFIX_TESTNET = ".factory01.littlefarm.testnet";
+export const PROJECT_VALIDATOR_PREFIX_TESTNET = "staked.pool.f863973.m0";
 export const VALIDATOR_PREFIX_TESTNET = ".m0";
 
 export const PROJECT_VALIDATOR_REGEXP_TESTNET = new RegExp(`.*(${PROJECT_VALIDATOR_PREFIX_TESTNET}|${VALIDATOR_PREFIX_TESTNET})`);