Skip to content
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.

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

Version 6.7.2 gas limit fix #6786

Merged
merged 10 commits into from
Jul 3, 2019
Merged

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Jul 2, 2019

No description provided.

@danjm danjm requested a review from whymarrh as a code owner July 2, 2019 16:47
@danjm danjm changed the base branch from develop to Version-6.7.2 July 2, 2019 16:47
@danjm danjm added the DO-NOT-MERGE Pull requests that should not be merged label Jul 2, 2019
@danjm danjm force-pushed the Version-6.7.2-gasLimitFix branch from e755843 to 0d5858f Compare July 3, 2019 13:30
Copy link
Contributor

@whymarrh whymarrh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A few small comments

gasLimit: this.props.customGasLimit,
}
this.changeGasPrice = debounce(this.changeGasPrice, 500)
this.changeGasLimit = debounce(this.changeGasLimit, 500)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use the property syntax for the debounce? That is, wrap the property value in the debounce call directly. If we can remove theses lines we can move the state to a property as well and remove the constructor.

} = confirmTransaction


const transaction = selectedAddressTxList.find(({ id }) => id === (Number(paramsTransactionId) || transactionId))
console.log('!!! * transaction', transaction)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: console log

const {
from: fromAddress,
to: txParamsToAddress,
gasPrice,
gas: gasLimit,
value: amount,
data,
} = txParams
} = transaction && transaction.txParams || txParams
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we express this instead with a ternary?

@whymarrh
Copy link
Contributor

whymarrh commented Jul 3, 2019

I'm testing out 8e967aa locally now

@danjm danjm added N04-needsQA and removed DO-NOT-MERGE Pull requests that should not be merged labels Jul 3, 2019
}

onChangeGasPrice = (e) => {
this.setState({ gasPrice: e.target.value })
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should e.target.value be converted to a Number here?

Edit: Likewise for onChangeGasLimit above

@danjm danjm force-pushed the Version-6.7.2-gasLimitFix branch from 989c873 to 2ef4078 Compare July 3, 2019 18:27
@danjm danjm force-pushed the Version-6.7.2-gasLimitFix branch from 2ef4078 to 1b7f62f Compare July 3, 2019 18:41
@metamaskbot
Copy link
Collaborator

Builds ready [1b7f62f]: chrome, firefox, edge, opera

@metamaskbot
Copy link
Collaborator

Builds ready [4330341]: chrome, firefox, edge, opera

@danfinlay danfinlay merged commit 632c9b2 into Version-6.7.2 Jul 3, 2019
@danfinlay danfinlay deleted the Version-6.7.2-gasLimitFix branch July 3, 2019 20:33
danjm added a commit that referenced this pull request Jul 4, 2019
* Introduce delay for eth_estimateGas calls with in test

* Add test that fails when gas estimates of contract method calls without gas are too high.

* Get transaction gas data from unApprovedTxs instead of confirmTransaction

* Fix selection of gas data in gas-modal-page-container.container

* Lint changes related to Version-6.7.2-gasLimitFix

* Fix e2e tests on Version-6.7.2-gasLimitFix

* Fix unit and integration tests for changes from Version-6.7.2-gasLimitFix

* more e2e fixes

* Add assertions for transaction values on confirm screen

* Fix display of transaction amount on confirm screen.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants