Skip to content

Fix validatorPrefs (don't pull defaults) #1885

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jacogr merged 1 commit into from
Nov 14, 2019
Merged

Fix validatorPrefs (don't pull defaults) #1885

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 29 additions & 38 deletions packages/app-staking/src/Actions/Account/Validate.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,34 +35,35 @@ class Validate extends TxComponent<Props, State> {
validatorPayment: new BN(0)
};

// FIXME Borken with new InputBalance
// inject the preferences returned via RPC once into the state (from this
// point forward it will be entirely managed by the actual inputs)
public static getDerivedStateFromProps ({ isSubstrateV2, validatorPrefs }: Props, state: State): Pick<State, never> | null {
if (state.unstakeThreshold && state.validatorPayment) {
return null;
}

if (validatorPrefs) {
// 1.x, it has both values
if (isSubstrateV2) {
const { validatorPayment } = validatorPrefs as ValidatorPrefs;

return {
validatorPayment: validatorPayment.toBn()
};
} else {
const { unstakeThreshold, validatorPayment } = validatorPrefs as ValidatorPrefs0to145;

return {
unstakeThreshold: unstakeThreshold.toBn(),
unstakeThresholdError: null,
validatorPayment: validatorPayment.toBn()
};
}
}

return null;
}
// public static getDerivedStateFromProps ({ isSubstrateV2, validatorPrefs }: Props, state: State): Pick<State, never> | null {
// if (state.unstakeThreshold && state.validatorPayment) {
// return null;
// }

// if (validatorPrefs) {
// // 1.x, it has both values
// if (isSubstrateV2) {
// const { validatorPayment } = validatorPrefs as ValidatorPrefs;

// return {
// validatorPayment: validatorPayment.toBn()
// };
// } else {
// const { unstakeThreshold, validatorPayment } = validatorPrefs as ValidatorPrefs0to145;

// return {
// unstakeThreshold: unstakeThreshold.toBn(),
// unstakeThresholdError: null,
// validatorPayment: validatorPayment.toBn()
// };
// }
// }

// return null;
// }

public render (): React.ReactNode {
const { isOpen } = this.props;
Expand Down Expand Up @@ -120,7 +121,7 @@ class Validate extends TxComponent<Props, State> {

private renderContent (): React.ReactNode {
const { controllerId, isSubstrateV2, stashId, t, validatorPrefs } = this.props;
const { unstakeThreshold, unstakeThresholdError, validatorPayment } = this.state;
const { unstakeThreshold, unstakeThresholdError } = this.state;
const defaultThreshold = validatorPrefs && (validatorPrefs as ValidatorPrefs0to145).unstakeThreshold && (validatorPrefs as ValidatorPrefs0to145).unstakeThreshold.toBn();

return (
Expand Down Expand Up @@ -153,11 +154,6 @@ class Validate extends TxComponent<Props, State> {
label={t('automatic unstake threshold')}
onChange={this.onChangeThreshold}
onEnter={this.sendTx}
value={
unstakeThreshold
? unstakeThreshold.toString()
: '3'
}
/>
<InputValidationUnstakeThreshold
onError={this.onUnstakeThresholdError}
Expand All @@ -167,16 +163,11 @@ class Validate extends TxComponent<Props, State> {
)}
<InputBalance
className='medium'
defaultValue={validatorPrefs && validatorPrefs.validatorPayment && validatorPrefs.validatorPayment.toBn()}
defaultValue={validatorPrefs?.validatorPayment?.toBn()}
help={t('Amount taken up-front from the reward by the validator before splitting the remainder between themselves and the nominators')}
label={t('reward commission')}
onChange={this.onChangePayment}
onEnter={this.sendTx}
value={
validatorPayment
? validatorPayment.toString()
: '0'
}
/>
</Modal.Content>
</>
Expand Down