- {props.name
+ {props.name && props.name !== 'Multi-Delegate'
?
{props.name + 'd Successfully'}
- : props.match && props.match.params && props.match.params.proposalID
- ?
{variables[props.lang].vote_success}
- : props.claimValidator && props.claimValidator !== 'none'
- ?
{variables[props.lang].claimed_success}
- :
{variables[props.lang].success}
}
+ : props.name
+ ?
{variables[props.lang].delegate + 'd Successfully'}
+ : props.router && props.router.params && props.router.params.proposalID
+ ?
{variables[props.lang].vote_success}
+ : props.claimValidator && props.claimValidator !== 'none'
+ ?
{variables[props.lang].claimed_success}
+ :
{variables[props.lang].success}
}
- {props.match && props.match.params && props.match.params.proposalID && props.hash
+ {props.router && props.router.params && props.router.params.proposalID && props.hash
?
{variables[props.lang].tokens}
{props.tokens
@@ -161,19 +249,19 @@ SuccessDialog.propTypes = {
claimValidator: PropTypes.string.isRequired,
handleClose: PropTypes.func.isRequired,
hash: PropTypes.string.isRequired,
- history: PropTypes.shape({
- push: PropTypes.func.isRequired,
- }).isRequired,
lang: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
open: PropTypes.bool.isRequired,
+ selectedMultiValidatorArray: PropTypes.array.isRequired,
toValidator: PropTypes.string.isRequired,
validator: PropTypes.string.isRequired,
+ validatorImages: PropTypes.array.isRequired,
address: PropTypes.string,
- match: PropTypes.shape({
+ router: PropTypes.shape({
+ navigate: PropTypes.func.isRequired,
params: PropTypes.shape({
proposalID: PropTypes.string,
- }),
+ }).isRequired,
}),
tokens: PropTypes.any,
validatorList: PropTypes.arrayOf(
@@ -198,7 +286,9 @@ const stateToProps = (state) => {
validator: state.stake.validator.value,
toValidator: state.stake.toValidator.value,
validatorList: state.stake.validators.list,
+ validatorImages: state.stake.validators.images,
claimValidator: state.stake.claimDialog.validator,
+ selectedMultiValidatorArray: state.stake.selectMultiValidators.list,
};
};
diff --git a/src/containers/Stake/DelegateDialog/TokensTextField.js b/src/containers/Stake/DelegateDialog/TokensTextField.js
index 71a8c7d..ee0edb4 100644
--- a/src/containers/Stake/DelegateDialog/TokensTextField.js
+++ b/src/containers/Stake/DelegateDialog/TokensTextField.js
@@ -44,7 +44,7 @@ const TokensTextField = (props) => {
parseFloat(availableTokens + vestingTokens)
- : props.name === 'Delegate' || props.name === 'Stake'
+ : props.name === 'Delegate' || props.name === 'Stake' || props.name === 'Multi-Delegate'
? props.value > parseFloat(availableTokens)
: props.name === 'Undelegate' || props.name === 'Redelegate'
? props.value > parseFloat(stakedTokens) : false}
@@ -66,7 +66,10 @@ const TokensTextField = (props) => {
? props.onChange(stakedTokens)}>
{stakedTokens}
- : null}
+ : props.name === 'Multi-Delegate'
+ ? props.onChange(availableTokens)}>
+ {availableTokens}
+
: null}
{vestingTokens && (props.name === 'Delegate' || props.name === 'Stake')
?
diff --git a/src/containers/Stake/DelegateDialog/ValidatorSelectField.js b/src/containers/Stake/DelegateDialog/ValidatorSelectField.js
index a1b8c9f..4dc9605 100644
--- a/src/containers/Stake/DelegateDialog/ValidatorSelectField.js
+++ b/src/containers/Stake/DelegateDialog/ValidatorSelectField.js
@@ -18,10 +18,11 @@ const ValidatorSelectField = (props) => {
props.onChange(value);
};
- let validatorList = props.validatorList;
+ let validatorList = [...props.validatorList];
+ validatorList.push(...props.inActiveValidators);
if (props.name === 'Undelegate' || props.name === 'Redelegate') {
- validatorList = props.delegatedValidatorList;
+ validatorList = [...props.delegatedValidatorList];
}
return (
@@ -72,6 +73,7 @@ const ValidatorSelectField = (props) => {
};
ValidatorSelectField.propTypes = {
+ inActiveValidators: PropTypes.array.isRequired,
items: PropTypes.array.isRequired,
lang: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
@@ -118,6 +120,7 @@ const stateToProps = (state) => {
name: state.stake.delegateDialog.name,
validatorImages: state.stake.validators.images,
delegatedValidatorList: state.stake.delegatedValidators.list,
+ inActiveValidators: state.stake.inActiveValidators.list,
};
};
diff --git a/src/containers/Stake/DelegateDialog/index.css b/src/containers/Stake/DelegateDialog/index.css
index 3668d2f..927f6be 100644
--- a/src/containers/Stake/DelegateDialog/index.css
+++ b/src/containers/Stake/DelegateDialog/index.css
@@ -168,3 +168,121 @@
.pending img {
width: 100px;
}
+
+.mv_formControl {
+ width: 100%;
+}
+
+.mv_select {
+ border: solid #696969 0.3px;
+ height: 48px;
+}
+
+.mv_select .MuiOutlinedInput-notchedOutline {
+ border: none !important;
+}
+
+.mv_select em {
+ color : #696969;
+ padding-left: 5px;
+ font-size: 16px;
+ font-family: 'Blinker', sans-serif;
+ font-style: normal;
+}
+
+.image {
+ background: #696969;
+ width: 30px;
+ height: 30px;
+ border-radius: 50px;
+ margin-right: 10px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+}
+
+div[role=tooltip] .image_small {
+ background: #696969;
+ width: 26px;
+ height: 26px;
+ border-radius: 50px;
+ margin-right: 8px;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ color: #fff;
+}
+
+div[role=presentation] .mv_menuItem {
+ font-family: 'Blinker', sans-serif;
+ font-weight: 600;
+ font-size: 18px;
+ line-height: 130%;
+ color: #FFFFFF;
+ padding: 8px 40px;
+}
+
+div[role=tooltip] .mv_menuItem_small {
+ font-family: 'Blinker', sans-serif;
+ font-weight: 600;
+ font-size: 16px;
+ line-height: 130%;
+ color: #FFFFFF;
+ padding: 8px 0 8px 4px;
+}
+
+div[role=tooltip] .name_small,
+div[role=tooltip] .hash_text_small {
+ font-size: 16px;
+ font-weight: 400;
+}
+
+div[role=tooltip] .name_cut {
+ max-width: 130px;
+ overflow: hidden;
+ white-space: nowrap;
+}
+
+div[role=tooltip] .hash_text_small {
+ margin-left: 10px;
+}
+
+div[role=presentation] .mv_menuItem:hover {
+ background-color: #070707;
+}
+
+div[role=presentation] .mv_menuItem .checkbox {
+ color: pink;
+}
+
+div[role=presentation] .divider {
+ background-color: #545454;
+}
+
+.content .row .validator .popover_button {
+ cursor: pointer;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ padding-bottom: 2px;
+ padding-left: 1px;
+ border-radius: 50%;
+ width: 25px;
+ height: 25px;
+ min-width: unset;
+ border: solid #676768;
+ margin-left: 10px;
+ color: white;
+}
+
+div[role=tooltip] .validator_popover,
+div[role=presentation] .validator_popover {
+ color: white;
+ text-align: start;
+ font-family: 'Blinker', sans-serif;
+ font-size: 16px;
+ font-weight: 350;
+ line-height: 160%;
+ margin-right: 15px;
+}
\ No newline at end of file
diff --git a/src/containers/Stake/DelegateDialog/index.js b/src/containers/Stake/DelegateDialog/index.js
index b3fc753..fc22a69 100644
--- a/src/containers/Stake/DelegateDialog/index.js
+++ b/src/containers/Stake/DelegateDialog/index.js
@@ -9,10 +9,12 @@ import {
showDelegateFailedDialog,
showDelegateProcessingDialog,
showDelegateSuccessDialog,
+ selectMultiValidators,
} from '../../../actions/stake';
import ValidatorSelectField from './ValidatorSelectField';
import TokensTextField from './TokensTextField';
import ToValidatorSelectField from './ToValidatorSelectField';
+import MultiValidatorSelectField from './MultiValidatorSelectField';
import { cosmoStationSign, signTxAndBroadcast } from '../../../helper';
import {
fetchRewards,
@@ -64,6 +66,50 @@ const DelegateDialog = (props) => {
signTxAndBroadcast(updatedTx, props.address, handleFetch);
};
+ const handleMultiDelegate = () => {
+ setInProgress(true);
+ let gasValue = gas.delegate;
+ if (props.selectedMultiValidatorArray && props.selectedMultiValidatorArray.length > 1) {
+ gasValue = ((gas.delegate * props.selectedMultiValidatorArray.length) / 1.1) + gas.delegate;
+ }
+
+ const updatedTx = {
+ msgs: [],
+ fee: {
+ amount: [{
+ amount: String(gasValue * config.GAS_PRICE_STEP_AVERAGE),
+ denom: config.COIN_MINIMAL_DENOM,
+ }],
+ gas: String(gasValue),
+ },
+ memo: '',
+ };
+
+ if (props.selectedMultiValidatorArray.length) {
+ props.selectedMultiValidatorArray.map((item) => {
+ updatedTx.msgs.push({
+ typeUrl: '/cosmos.staking.v1beta1.MsgDelegate',
+ value: {
+ delegatorAddress: props.address,
+ validatorAddress: item,
+ amount: {
+ amount: String(Math.floor((props.amount * (10 ** config.COIN_DECIMALS)) / (props.selectedMultiValidatorArray.length))),
+ denom: config.COIN_MINIMAL_DENOM,
+ },
+ },
+ });
+ return null;
+ });
+ }
+
+ if (localStorage.getItem('of_co_wallet') === 'cosmostation') {
+ cosmoStationSign(updatedTx, props.address, handleFetch);
+ return;
+ }
+
+ signTxAndBroadcast(updatedTx, props.address, handleFetch);
+ };
+
const handleFetch = (error, result) => {
setInProgress(false);
if (error) {
@@ -118,7 +164,7 @@ const DelegateDialog = (props) => {
}
};
- let staked = props.delegations.reduce((accumulator, currentValue) => {
+ let staked = props.delegations && props.delegations.reduce((accumulator, currentValue) => {
return accumulator + Number(currentValue.balance.amount);
}, 0);
const balance = props.balance && props.balance.length && props.balance.find((val) => val.denom === config.COIN_MINIMAL_DENOM);
@@ -146,9 +192,9 @@ const DelegateDialog = (props) => {
}
const disable = !props.validator || !props.amount || inProgress ||
- ((props.name === 'Delegate' || props.name === 'Stake') && vestingTokens
+ ((props.name === 'Delegate' || props.name === 'Stake' || props.name === 'Multi-Delegate') && vestingTokens
? props.amount > parseFloat((available + vestingTokens) / (10 ** config.COIN_DECIMALS))
- : props.name === 'Delegate' || props.name === 'Stake'
+ : props.name === 'Delegate' || props.name === 'Stake' || props.name === 'Multi-Delegate'
? props.amount > parseFloat(available / (10 ** config.COIN_DECIMALS))
: props.name === 'Undelegate' || props.name === 'Redelegate'
? props.amount > parseFloat(staked / (10 ** config.COIN_DECIMALS)) : false);
@@ -170,10 +216,16 @@ const DelegateDialog = (props) => {
To validator
- : <>
-
Choose the validator
-
- }
+ : props.name === 'Multi-Delegate'
+ ? <>
+
Select Multi Validators
+
+
+ : <>
+
Choose the validator
+
+
+ }
Enter tokens to {props.name || 'Delegate'}
@@ -181,7 +233,7 @@ const DelegateDialog = (props) => {