Skip to content

Version v11.16.1#24840

Merged
danjm merged 6 commits intomasterfrom
Version-v11.16.1
May 29, 2024
Merged

Version v11.16.1#24840
danjm merged 6 commits intomasterfrom
Version-v11.16.1

Conversation

@danjm
Copy link
Copy Markdown
Contributor

@danjm danjm commented May 28, 2024

No description provided.

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented May 28, 2024

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.

@metamaskbot metamaskbot added INVALID-PR-TEMPLATE PR's body doesn't match template release-11.16.1 Issue or pull request that will be included in release 11.16.1 labels May 28, 2024
@metamaskbot
Copy link
Copy Markdown
Collaborator

metamaskbot commented May 28, 2024

Builds ready [603cdcd]
Page Load Metrics (955 ± 524 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint671611072713
domContentLoaded12362473
load5529229551092524
domInteractive12362473

@dbrans @seaona
cherry-pick test: fix flaky test `Import ERC1155 NFT should be... (#2…
3f270a0 
…4709) into v11.16.1 (#24847)

cherry-pick test: fix flaky test `Import ERC1155 NFT should be able to
import an … 3ddb0d4 (#24709) into
v11.16.1

No merge conflicts

Co-authored-by: seaona <54408225+seaona@users.noreply.github.com>
This was referenced May 28, 2024
Merged
Merged
dbrans and others added 4 commits May 28, 2024 19:21
@dbrans
cherry-pick feat: Revert disable stx opt-in modal (#24845) into v11.1…
e773dcd 
…6.1 (#24848)

cherry-pick feat: Revert disable stx opt-in modal
abc0268 (#24845) into v11.16.1

no merge conflicts
@dbrans @dan437
cherrypick feat: Add "You may close this window anytime" to STX statu…
35bede7 
…s page (#24772) (#24842)

cherrypick feat: Add "You may close this window anytime" to STX status
page 2877190 (#24772)

No merge conflicts

Co-authored-by: Daniel <80175477+dan437@users.noreply.github.com>
@dbrans @Gudahtt
cherrypick fix: Fix transaction metric event asset type detection (#2…
358859a 
…4770) into v11.16.1 (#24843)

🍒-pick fix: Fix transaction metric event asset type detection
c1bba92 (#24770) into v11.16.1

Merge conflict in `shared/modules/transaction.utils.ts` (accepted
incoming):
```typescript
    try {
      // We don't need a balance check, so the second parameter to
      // getTokenStandardAndDetails is omitted.
<<<<<<< HEAD
      const details = getTokenStandardAndDetails(txMeta.txParams.to);
=======
      const details = await getTokenStandardAndDetails(txMeta.txParams.to);
>>>>>>> c1bba92 (fix: Fix transaction metric event asset type detection (#24770))
      if (details.standard) {
        return {
```

Co-authored-by: Mark Stacey <markjstacey@gmail.com>
@dbrans @dan437
cherrypick feat: stx opt-in modal "Manage in settings" variation (#24771
78b6874 
) into v11.16.1 (#24841)

cherrypick feat: stx opt-in modal "Manage in settings" variation
82fe51c (#24771) into v11.16.1

No merge conflicts

Co-authored-by: Daniel <80175477+dan437@users.noreply.github.com>
@danjm danjm force-pushed the Version-v11.16.1 branch from 760543f to 78b6874 Compare May 28, 2024 23:34
This was referenced May 29, 2024
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
@danjm danjm marked this pull request as ready for review May 29, 2024 00:51
@danjm danjm requested a review from a team as a code owner May 29, 2024 00:51
@metamaskbot
Copy link
Copy Markdown
Collaborator

metamaskbot commented May 29, 2024

Builds ready [78b6874]
Page Load Metrics (1407 ± 638 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint802211394723
domContentLoaded129935189
load68339614071329638
domInteractive119935189

@danjm danjm merged commit b478b62 into master May 29, 2024
@danjm danjm deleted the Version-v11.16.1 branch May 29, 2024 00:53
@github-actions github-actions bot locked and limited conversation to collaborators May 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

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

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@danjm @metamaskbot @dbrans