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

Fix advanced inline gas editing #6122

Merged
merged 2 commits into from
Feb 8, 2019
Merged

Conversation

whymarrh
Copy link
Contributor

@whymarrh whymarrh commented Feb 8, 2019

Fixes #6118

This PR fixes the ability to use both the non-advanced and advanced gas editing from the send and confirm screens. We were previously mixing hex and decimals numbers/overloading the dispatch functions for setting the gas data (#6112, #6114) and this PR moves the decimal/hex conversions into the container for the advanced controls where it's needed and uses the existing functions for dispatches which all expect gas in hex.

(This PR includes #6121 because that fixes the build, and I'm all about that green build. I can rebase this PR once that's merged.)

@whymarrh whymarrh requested review from danjm and tmashuang February 8, 2019 14:22
@whymarrh
Copy link
Contributor Author

whymarrh commented Feb 8, 2019

Depending on what the status of the e2e tests are when you read this, I might still be working on 'em

@whymarrh whymarrh force-pushed the fix-gas-editing branch 4 times, most recently from 9e8573c to 72c8ae0 Compare February 8, 2019 17:56
danjm
danjm previously approved these changes Feb 8, 2019
@whymarrh whymarrh merged commit fbc2d58 into MetaMask:develop Feb 8, 2019
@whymarrh whymarrh deleted the fix-gas-editing branch February 8, 2019 20:26
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.

Unable to Send Transaction when selecting Tx Fee rates in MetaMask on v6
2 participants