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

Cleanup network enums #8627

Merged
merged 4 commits into from
May 20, 2020
Merged

Cleanup network enums #8627

merged 4 commits into from
May 20, 2020

Conversation

rekmarks
Copy link
Member

@rekmarks rekmarks commented May 19, 2020

Network enums were declared in multiple files, were poorly named, and were missing some enums in places. This PR cleans them up and sets up other fixes related to our network enums.

Also adds chain IDs to NetworkController.getNetworkDisplayName tests.

@metamaskbot
Copy link
Collaborator

Builds ready [4e79e73]
Page Load Metrics (648 ± 53 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint328239115
domContentLoaded34077664711153
load34277964811153
domInteractive34077664611153

@rekmarks rekmarks changed the title Cleanup network enums; fix infuraClient chainId Cleanup network enums May 19, 2020
@rekmarks rekmarks marked this pull request as ready for review May 19, 2020 18:25
@rekmarks rekmarks requested a review from a team as a code owner May 19, 2020 18:25
@metamaskbot
Copy link
Collaborator

Builds ready [da71e94]
Page Load Metrics (656 ± 68 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint318242115
domContentLoaded36187265514168
load36387465614168
domInteractive36187265414168

Copy link
Contributor

@brad-decker brad-decker left a comment

Choose a reason for hiding this comment

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

Looks clean. LGTM

@rekmarks rekmarks merged commit f748664 into develop May 20, 2020
@rekmarks rekmarks deleted the fix-network-enums branch May 20, 2020 15:57
Gudahtt added a commit that referenced this pull request Jul 8, 2020
The `metamaskNetworkId` property in the `txMeta` for incoming
transactions was incorrectly set as a Number instead of a String. This
change was made accidentally as part of #8627.

As a result incoming transactions were being excluded from the
transaction list, as they didn't have a matching network ID.

`metamaskNetworkId` is now set to a string, and a migration has been
added to ensure `metamaskNetworkId` is converted to a string for any
incoming transactions in state.
Gudahtt added a commit that referenced this pull request Jul 8, 2020
The `metamaskNetworkId` property in the `txMeta` for incoming
transactions was incorrectly set as a Number instead of a String. This
change was made accidentally as part of #8627.

As a result incoming transactions were being excluded from the
transaction list, as they didn't have a matching network ID.

`metamaskNetworkId` is now set to a string, and a migration has been
added to ensure `metamaskNetworkId` is converted to a string for any
incoming transactions in state.
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