correct profitPercent variable name

This commit is contained in:
fmtabbara
2021-12-13 21:11:12 +00:00
parent 2045d0bafd
commit 140cc3f769
3 changed files with 17 additions and 13 deletions
+5 -3
View File
@@ -52,12 +52,14 @@ export const checkGatewayOwnership = async (): Promise<boolean> => await invoke(
export const bond = async ({
type,
data,
amount,
pledge,
ownerSignature,
}: {
type: EnumNodeType
data: MixNode | Gateway
amount: Coin
}): Promise<any> => await invoke(`bond_${type}`, { [type]: data, pledge: amount })
pledge: Coin
ownerSignature: string
}): Promise<any> => await invoke(`bond_${type}`, { [type]: data, ownerSignature, pledge })
export const unbond = async (type: EnumNodeType) => await invoke(`unbond_${type}`)
+11 -9
View File
@@ -27,7 +27,7 @@ type TBondFormFields = {
ownerSignature: string
identityKey: string
sphinxKey: string
profitPercentage: number
profitMarginPercent: number
amount: string
host: string
version: string
@@ -43,10 +43,11 @@ const defaultValues = {
nodeType: EnumNodeType.mixnode,
identityKey: '',
sphinxKey: '',
ownerSignature: '',
amount: '',
host: '',
version: '',
profitPercentage: 0,
profitMarginPercent: 10,
location: undefined,
mixPort: 1789,
verlocPort: 1790,
@@ -61,6 +62,7 @@ const formatData = (data: TBondFormFields) => {
host: data.host,
version: data.version,
mix_port: data.mixPort,
profit_margin_percent: data.profitMarginPercent,
}
if (data.nodeType === EnumNodeType.mixnode) {
@@ -109,9 +111,9 @@ export const BondForm = ({
}
const formattedData = formatData(data)
const amount = await majorToMinor(data.amount)
const pledge = await majorToMinor(data.amount)
await bond({ type: data.nodeType, data: formattedData, amount })
await bond({ type: data.nodeType, ownerSignature: data.ownerSignature, data: formattedData, pledge })
.then(() => {
userBalance.fetchBalance()
onSuccess({ address: data.identityKey, amount: data.amount })
@@ -201,15 +203,15 @@ export const BondForm = ({
<Grid item xs={12} sm={6}>
<TextField
{...register('profitPercentage')}
{...register('profitMarginPercent')}
variant="outlined"
required
id="profitPercentage"
name="profitPercentage"
id="profitMarginPercent"
name="profitMarginPercent"
label="Profit percentage"
fullWidth
error={!!errors.profitPercentage}
helperText={errors.profitPercentage?.message}
error={!!errors.profitMarginPercent}
helperText={errors.profitMarginPercent?.message}
disabled={disabled}
/>
</Grid>
@@ -25,7 +25,7 @@ export const validationSchema = Yup.object().shape({
.test('valid-signature', 'A valid signature is required', function (value) {
return validateKey(value || '', 64)
}),
profitPercentage: Yup.string().required('Profit Percentage is required').min(1).max(100),
profitMarginPercent: Yup.number().required('Profit Percentage is required').min(1).max(100),
amount: Yup.string()
.required('An amount is required')
.test('valid-amount', `A valid amount is required (min 100 ${MAJOR_CURRENCY})`, function (value) {