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

Revert to providing inline defaults in getHexGasTotal and increaseLastGasPrice #6361

Merged
merged 1 commit into from
Mar 29, 2019

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Mar 28, 2019

Takes us back to 0346089, which correctly handled null.

@danjm danjm requested a review from whymarrh as a code owner March 28, 2019 01:19
whymarrh
whymarrh previously approved these changes Mar 28, 2019
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.

LGTM

@whymarrh whymarrh force-pushed the dont-assume-tx-has-gas-data-in-list branch from 4938229 to 83633f9 Compare March 29, 2019 15:06
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.

LGTM

@metamaskbot
Copy link
Collaborator

Builds ready [83633f9]: chrome, firefox, edge, opera

@whymarrh whymarrh merged commit 1d14646 into develop Mar 29, 2019
@whymarrh whymarrh deleted the dont-assume-tx-has-gas-data-in-list branch March 29, 2019 15:18
@whymarrh whymarrh mentioned this pull request Mar 29, 2019
vittominacori added a commit to vittominacori/metamask-extension that referenced this pull request Apr 3, 2019
* 'master' of https://github.com/MetaMask/metamask-extension: (84 commits)
  Version 6.3.1
  Check token name constants against the lower case methodData name in conf tx switch container.
  Ensure correct confirm screen in case of smartcontract check fail
  About tab copy changes; Update route for Info & Help in account menu (MetaMask#6356)
  Revert to providing inline defaults in getHexGasTotal and increaseLastGasPrice (MetaMask#6361)
  Further e2e fixes in wake of MetaMask#6364 and MetaMask#6367 (MetaMask#6374)
  Split e2e run-all commands onto multiple lines
  Run from-import e2e tests with additional account, to avoid conflict with accounts in earlier test runs
  Use localhost instead of mainnent/infura for custom rpc tests in e2e tests.
  ci: Add build:test Gulp task for e2e build
  e2e: Update Contract Interaction wording
  e2e: Skip approving token test
  send-footer.utils.js - addressIsNew - improve readability
  test - unit - ui - actions - setCompletedOnboarding - fix stub to call callback
  lint fix
  actions - setCompletedOnboarding - make async with pify
  notice-controller - make markAllNoticesRead sync
  lib - nodeify - correctly wrap synchronous functions
  notices - markAllNoticesRead - use async/await
  buy-eth-url - lint fix
  ...
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.

3 participants