arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-27 10:48:22 +00:00
Code Issues Releases Wiki Activity

mend

Browse Source
This commit is contained in:
slowbackspace 2019-05-03 22:03:29 +02:00
parent 1a1a4daaa9
commit adce529d5a
1 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/actions/ethereum/SendFormValidationActions.js
View File

@ -152,16 +152,13 @@ export const addressValidation = ($state: State): PayloadAction<State> => (): St
const { address } = state; const { address } = state;
if (address.length < 1) { if (address.length < 1) {
// state.errors.address = 'Address is not set';
state.errors.address = l10nMessages.TR_ADDRESS_IS_NOT_SET; state.errors.address = l10nMessages.TR_ADDRESS_IS_NOT_SET;
} else if (!EthereumjsUtil.isValidAddress(address)) { } else if (!EthereumjsUtil.isValidAddress(address)) {
// state.errors.address = 'Address is not valid';
state.errors.address = l10nMessages.TR_ADDRESS_IS_NOT_VALID; state.errors.address = l10nMessages.TR_ADDRESS_IS_NOT_VALID;
} else if ( } else if (
validators.hasUppercase(address) && validators.hasUppercase(address) &&
!EthereumjsUtil.isValidChecksumAddress(address) !EthereumjsUtil.isValidChecksumAddress(address)
) { ) {
// state.errors.address = 'Address is not a valid checksum';
state.errors.address = l10nMessages.TR_ADDRESS_CHECKSUM_IS_NOT_VALID; state.errors.address = l10nMessages.TR_ADDRESS_CHECKSUM_IS_NOT_VALID;
} }
return state; return state;
@ -262,7 +259,6 @@ export const amountValidation = ($state: State): PayloadAction<State> => (
if (!token) return state; if (!token) return state;
if (!validators.hasDecimals(state.amount, parseInt(token.decimals, 0))) { if (!validators.hasDecimals(state.amount, parseInt(token.decimals, 0))) {
// state.errors.amount = `Maximum ${token.decimals} decimals allowed`;
state.errors.amount = { state.errors.amount = {
...l10nMessages.TR_MAXIMUM_DECIMALS_ALLOWED, ...l10nMessages.TR_MAXIMUM_DECIMALS_ALLOWED,
values: { decimals: token.decimals }, values: { decimals: token.decimals },
@ -274,21 +270,17 @@ export const amountValidation = ($state: State): PayloadAction<State> => (
networkSymbol: state.networkSymbol, networkSymbol: state.networkSymbol,
}, },
}; };
// state.errors.amount = `Not enough ${state.networkSymbol} to cover transaction fee`;
} else if ( } else if (
new BigNumber(state.amount).isGreaterThan( new BigNumber(state.amount).isGreaterThan(
new BigNumber(token.balance).minus(pendingAmount) new BigNumber(token.balance).minus(pendingAmount)
) )
) { ) {
// state.errors.amount = 'Not enough funds';
state.errors.amount = l10nMessages.TR_NOT_ENOUGH_FUNDS; state.errors.amount = l10nMessages.TR_NOT_ENOUGH_FUNDS;
} else if (new BigNumber(state.amount).isLessThanOrEqualTo('0')) { } else if (new BigNumber(state.amount).isLessThanOrEqualTo('0')) {
// TODO: this is never gonna happen! It will fail in second if condiftion (isNumber validation) // TODO: this is never gonna happen! It will fail in second if condiftion (isNumber validation)
// state.errors.amount = 'Amount is too low';
state.errors.amount = l10nMessages.TR_AMOUNT_IS_TOO_LOW; state.errors.amount = l10nMessages.TR_AMOUNT_IS_TOO_LOW;
} }
} else if (!validators.hasDecimals(state.amount, 18)) { } else if (!validators.hasDecimals(state.amount, 18)) {
// state.errors.amount = 'Maximum 18 decimals allowed';
state.errors.amount = { state.errors.amount = {
...l10nMessages.TR_MAXIMUM_DECIMALS_ALLOWED, ...l10nMessages.TR_MAXIMUM_DECIMALS_ALLOWED,
values: { values: {
@ -300,7 +292,6 @@ export const amountValidation = ($state: State): PayloadAction<State> => (
new BigNumber(account.balance).minus(pendingAmount) new BigNumber(account.balance).minus(pendingAmount)
) )
) { ) {
// state.errors.amount = 'Not enough funds';
state.errors.amount = l10nMessages.TR_NOT_ENOUGH_FUNDS; state.errors.amount = l10nMessages.TR_NOT_ENOUGH_FUNDS;
} }
} }
@ -322,15 +313,12 @@ export const gasLimitValidation = ($state: State): PayloadAction<State> => (
const { gasLimit } = state; const { gasLimit } = state;
if (gasLimit.length < 1) { if (gasLimit.length < 1) {
// state.errors.gasLimit = 'Gas limit is not set';
state.errors.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_NOT_SET; state.errors.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_NOT_SET;
} else if (gasLimit.length > 0 && !validators.isNumber(gasLimit)) { } else if (gasLimit.length > 0 && !validators.isNumber(gasLimit)) {
// state.errors.gasLimit = 'Gas limit is not a number';
state.errors.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_NOT_A_NUMBER; state.errors.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_NOT_A_NUMBER;
} else { } else {
const gl: BigNumber = new BigNumber(gasLimit); const gl: BigNumber = new BigNumber(gasLimit);
if (gl.isLessThan(1)) { if (gl.isLessThan(1)) {
// state.errors.gasLimit = 'Gas limit is too low';
state.errors.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_TOO_LOW; state.errors.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_TOO_LOW;
} else if ( } else if (
gl.isLessThan( gl.isLessThan(
@ -339,7 +327,6 @@ export const gasLimitValidation = ($state: State): PayloadAction<State> => (
: network.defaultGasLimit : network.defaultGasLimit
) )
) { ) {
// state.warnings.gasLimit = 'Gas limit is below recommended';
state.warnings.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_BELOW_RECOMMENDED; state.warnings.gasLimit = l10nMessages.TR_GAS_LIMIT_IS_BELOW_RECOMMENDED;
} }
} }