Skip to content

Conversation

@danjm
Copy link
Contributor

@danjm danjm commented Jun 29, 2022

Created by:
git fetch
git checkout master
git reset --hard origin/master
git checkout master-sync
git revert 4d4271522 -m 1 (where 4d42715 was the merge commit for the revert of v10.16.0)
fix conflicts in ducks/send/send.test.js and package.json
git merge origin/develop

Gudahtt and others added 10 commits June 28, 2022 10:41
This reverts commit f09ab88, reversing
changes made to effc761.

This is being temporarily reverted to make it easier to release an
urgent fix for v10.15.1.
…oken transfer functions (#15064)

* Ensure that addresses are properly hex-prefixed in the generate ERC token transfer functions

* Ensure hex-prefixed addresses in send input

* Update unit tests

Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
This reverts commit 4d42715, reversing
changes made to f09ab88.
@danjm danjm requested a review from a team as a code owner June 29, 2022 12:56
@danjm danjm requested a review from jpuri June 29, 2022 12:56
@github-actions
Copy link
Contributor

CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes.

segun
segun previously approved these changes Jun 29, 2022
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Copy link
Member

@Gudahtt Gudahtt left a comment

Choose a reason for hiding this comment

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

LGTM!

@danjm danjm merged commit f9caa15 into develop Jun 29, 2022
@danjm danjm deleted the master-sync branch June 29, 2022 15:25
@metamaskbot
Copy link
Collaborator

Builds ready [83695c8]
Page Load Metrics (1869 ± 70 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint891941208398191
domContentLoaded16302314185714268
load16302314186914670
domInteractive16302314185714268

@github-actions github-actions bot locked and limited conversation to collaborators Jun 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants