arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-11-24 09:18:09 +00:00
Code Issues Releases Wiki Activity

update feeLevel onGasLimit change (while using estimateGasPrice - data

Browse Source 
change)
This commit is contained in:
Szymon Lesisz 2018-05-23 15:51:51 +02:00
parent b2602a198f
commit 4dae5a247a
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/js/actions/SendFormActions.js
View File

@ -716,7 +716,7 @@ export const onGasPriceChange = (gasPrice: string): ThunkAction => {
} }
} }
export const onGasLimitChange = (gasLimit: string): ThunkAction => { export const onGasLimitChange = (gasLimit: string, updateFeeLevels: boolean = false): ThunkAction => {
return (dispatch: Dispatch, getState: GetState): void => { return (dispatch: Dispatch, getState: GetState): void => {
const accountState: ?AccountState = getState().selectedAccount; const accountState: ?AccountState = getState().selectedAccount;
if (!accountState) return; if (!accountState) return;
@ -734,11 +734,22 @@ export const onGasLimitChange = (gasLimit: string): ThunkAction => {
}; };
if (gasLimit.match(numberRegExp) && state.gasPrice.match(numberRegExp)) { if (gasLimit.match(numberRegExp) && state.gasPrice.match(numberRegExp)) {
const customLevel: ?FeeLevel = state.feeLevels.find(f => f.value === 'Custom');
if (!customLevel) return;
customLevel.label = `${ calculateFee(currentState.gasPrice, gasLimit) } ${ state.coinSymbol }`;
state.selectedFeeLevel = customLevel; if (updateFeeLevels) {
const feeLevels: Array<FeeLevel> = getFeeLevels(state.coinSymbol, state.gasPrice, gasLimit, state.selectedFeeLevel);
const selectedFeeLevel: ?FeeLevel = feeLevels.find(f => f.value === state.selectedFeeLevel.value);
if (!selectedFeeLevel) return;
state.selectedFeeLevel = selectedFeeLevel;
state.feeLevels = feeLevels;
} else {
const customLevel: ?FeeLevel = state.feeLevels.find(f => f.value === 'Custom');
if (!customLevel) return;
customLevel.label = `${ calculateFee(currentState.gasPrice, gasLimit) } ${ state.coinSymbol }`;
state.selectedFeeLevel = customLevel;
}
if (state.setMax) { if (state.setMax) {
const account: ?Account = findAccount(getState().accounts, accountState.index, accountState.deviceState, accountState.network); const account: ?Account = findAccount(getState().accounts, accountState.index, accountState.deviceState, accountState.network);
@ -809,6 +820,7 @@ export const onDataChange = (data: string): AsyncAction => {
} }
} }
const estimateGasPrice = (): AsyncAction => { const estimateGasPrice = (): AsyncAction => {
return async (dispatch: Dispatch, getState: GetState): Promise<void> => { return async (dispatch: Dispatch, getState: GetState): Promise<void> => {
@ -817,7 +829,12 @@ const estimateGasPrice = (): AsyncAction => {
const web3instance: ?Web3Instance = getState().web3.filter(w3 => w3.network === accountState.network)[0]; const web3instance: ?Web3Instance = getState().web3.filter(w3 => w3.network === accountState.network)[0];
if (!web3instance) return; if (!web3instance) return;
const web3 = web3instance.web3; const web3 = web3instance.web3;
let currentState: State = getState().sendForm; const currentState: State = getState().sendForm;
const requestedData = currentState.data;
if (currentState.errors.data) {
return;
}
const data: string = '0x' + (currentState.data.length % 2 === 0 ? currentState.data : '0' + currentState.data); const data: string = '0x' + (currentState.data.length % 2 === 0 ? currentState.data : '0' + currentState.data);
const gasLimit = await estimateGas(web3instance.web3, { const gasLimit = await estimateGas(web3instance.web3, {
@ -827,16 +844,9 @@ const estimateGasPrice = (): AsyncAction => {
gasPrice: web3.toHex( EthereumjsUnits.convert(currentState.gasPrice, 'gwei', 'wei') ), gasPrice: web3.toHex( EthereumjsUnits.convert(currentState.gasPrice, 'gwei', 'wei') ),
}); });
currentState = getState().sendForm; if (getState().sendForm.data === requestedData) {
dispatch( onGasLimitChange(gasLimit.toString(), true) );
dispatch({ }
type: SEND.GAS_LIMIT_CHANGE,
state: {
...currentState,
gasLimit: gasLimit.toString()
}
});
} }
} }