-
-
Notifications
You must be signed in to change notification settings - Fork 189
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
Merge extension ens controller #1170
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It seems like even if we're bringing code from the extension we can use this opportunity to clean things up a bit. My suggestions below are mainly geared toward that end. However it also seems that there are other changes here that we might not want just yet.
Related: MetaMask/metamask-extension#18035 Something to consider bringing in here as well, or better saved for a follow-up? |
6f8caf4
to
8b80cd4
Compare
New dependency changes detected. Learn more about Socket for GitHub ↗︎ 👍 No new dependency issues detected in pull request Bot CommandsTo ignore an alert, reply with a comment starting with Pull request alert summary
📊 Modified Dependency Overview:
|
@legobeat Thanks for linking that PR, I wasn't aware of that. I looked through the PR and it doesn't seem to change the controller itself, so I think we should take care of that in a followup PR. |
b408e1f
to
5f5847f
Compare
@cryptodev-2s Just FYI, looks like the newest changes are failing the lint step. There's also the outstanding questions I have above. Let me know if my comments make sense or if you want to meet briefly to discuss them. |
@cryptodev-2s If you push up the changes you were showing me today then I can help you tweak this further! |
42346e8
to
704b617
Compare
69af306
to
ec95052
Compare
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
packages/transaction-controller/src/TransactionController.test.ts
Outdated
Show resolved
Hide resolved
08f49ec
to
f76e0d5
Compare
f76e0d5
to
c04737f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM!
Edit: Oh, lint failures. I can re-approve after those are fixed.
The network change handler for the ENS controller has been broken since the PR #1170 due to a conflict with #1196, which was merged around the same time. It referenced the `network` property of the network state that we have removed. The change handler has been updated to use `networkId` instead. Additionally, the `NetworkState` type has been imported so that we're less likely to make this mistake again.
The network change handler for the ENS controller has been broken since the PR #1170 due to a conflict with #1196, which was merged around the same time. It referenced the `network` property of the network state that we have removed. The change handler has been updated to use `networkId` instead. Additionally, the `NetworkState` type has been imported so that we're less likely to make this mistake again.
The network change handler for the ENS controller has been broken since the PR #1170 due to a conflict with #1196, which was merged around the same time. It referenced the `network` property of the network state that we have removed. The change handler has been updated to use `networkId` instead. Additionally, the `NetworkState` type has been imported so that we're less likely to make this mistake again.
The network change handler for the ENS controller has been broken since the PR #1170 due to a conflict with #1196, which was merged around the same time. It referenced the `network` property of the network state that we have removed. The change handler has been updated to use `networkId` instead. Additionally, the `NetworkState` type has been imported so that we're less likely to make this mistake again.
Merge extension ens controller
The network change handler for the ENS controller has been broken since the PR #1170 due to a conflict with #1196, which was merged around the same time. It referenced the `network` property of the network state that we have removed. The change handler has been updated to use `networkId` instead. Additionally, the `NetworkState` type has been imported so that we're less likely to make this mistake again.
Merge extension ens controller
The network change handler for the ENS controller has been broken since the PR #1170 due to a conflict with #1196, which was merged around the same time. It referenced the `network` property of the network state that we have removed. The change handler has been updated to use `networkId` instead. Additionally, the `NetworkState` type has been imported so that we're less likely to make this mistake again.
This PR merges the extension ens controller with the core ens controller
Fix issue #1129