Skip to content

Cherry-pick fix stopgap for BigNumber shift NaN issue (#24691) into v11.16.0#24700

Merged
danjm merged 1 commit intoVersion-v11.16.0from
Version-v11.16.0-decimals-stopgap
May 22, 2024
Merged

Cherry-pick fix stopgap for BigNumber shift NaN issue (#24691) into v11.16.0#24700
danjm merged 1 commit intoVersion-v11.16.0from
Version-v11.16.0-decimals-stopgap

Conversation

@dbrans
Copy link
Copy Markdown
Contributor

@dbrans dbrans commented May 22, 2024

Cherry-pick fix stopgap for BigNumber shift NaN issue 4233f9e (#24691) into v11.16.0.

There was a merge conflict – I rejected HEAD and accepted 4233f9ed06.

    const decimals =
<<<<<<< HEAD
      asset.standard === TokenStandard.ERC20 ? erc20Decimals[asset.address] : 0;
=======
      // TODO(dbrans): stopgap for https://github.com/MetaMask/metamask-extension/issues/24690
      asset.standard === TokenStandard.ERC20
        ? erc20Decimals[asset.address] ?? ERC20_DEFAULT_DECIMALS
        : 0;
>>>>>>> 4233f9ed06 (fix: stopgap for BigNumber shift NaN issue (#24691))
    const amount = getAssetAmount(tokenBc, decimals);

<!--
Please submit this PR as a draft initially.
Do not mark it as "Ready for review" until the template has been
completely filled out, and PR status checks have passed at least once.
-->

Stopgap for #24690

[![Open in GitHub
Codespaces](https://github.com/codespaces/badge.svg)](https://codespaces.new/MetaMask/metamask-extension/pull/24691?quickstart=1)

Related: #24690
– do not close this.

1. Try to reproduce
#24690

<!-- If applicable, add screenshots and/or recordings to visualize the
before and after of your change. -->

<!-- [screenshots/recordings] -->

<!-- [screenshots/recordings] -->

- [ ] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've completed the PR template to the best of my ability
- [ ] I’ve included tests if applicable
- [ ] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [ ] I’ve applied the right labels on the PR (see [labeling
guidelines](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/LABELING_GUIDELINES.md)).
Not required for external contributors.

- [ ] I've manually tested the PR (e.g. pull and build branch, run the
app, test code being changed).
- [ ] I confirm that this PR addresses all acceptance criteria described
in the ticket it closes and includes the necessary testing evidence such
as recordings and or screenshots.
@dbrans dbrans marked this pull request as ready for review May 22, 2024 00:41
@github-actions
Copy link
Copy Markdown
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.

@dbrans dbrans requested review from a team as code owners May 22, 2024 00:41
@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label May 22, 2024
@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [4d27d59]
Page Load Metrics (1541 ± 585 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint692941335125
domContentLoaded105930147
load57334515411218585
domInteractive105930147

@sleepytanya
Copy link
Copy Markdown
Contributor

Tested on Chrome and Firefox on mainnet, Op, BNB, Arbitrum, Polygon and Linea - I'm not seeing BigNumber NaN error.

@danjm danjm merged commit afafe48 into Version-v11.16.0 May 22, 2024
@danjm danjm deleted the Version-v11.16.0-decimals-stopgap branch May 22, 2024 08:37
@github-actions github-actions bot locked and limited conversation to collaborators May 22, 2024
@metamaskbot metamaskbot added the release-11.16.0 Issue or pull request that will be included in release 11.16.0 label May 22, 2024
@metamaskbot
Copy link
Copy Markdown
Collaborator

No release label on PR. Adding release label release-11.16.0 on PR, as PR was cherry-picked in branch 11.16.0.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

INVALID-PR-TEMPLATE PR's body doesn't match template release-11.16.0 Issue or pull request that will be included in release 11.16.0

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants