Skip to content

Version v11.14.4#24325

Merged
Gudahtt merged 3 commits intomasterfrom
Version-v11.14.4
May 1, 2024
Merged

Version v11.14.4#24325
Gudahtt merged 3 commits intomasterfrom
Version-v11.14.4

Conversation

@danjm
Copy link
Copy Markdown
Contributor

@danjm danjm commented May 1, 2024

This version reverts v11.15.0 so that we can push a v11.14.4 hotfix to prod

This reverts commit e70899b, reversing
changes made to ee9c6a5.
@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented May 1, 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.

@socket-security
Copy link
Copy Markdown

socket-security bot commented May 1, 2024

@metamaskbot metamaskbot added the INVALID-PR-TEMPLATE PR's body doesn't match template label May 1, 2024
@danjm danjm force-pushed the Version-v11.14.4 branch from f065c31 to b9dfff4 Compare May 1, 2024 13:38
danjm and others added 2 commits May 1, 2024 11:15
…24319)

## **Description**

Ensures that ERC1155s sends are no longer editable

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

## **Related issues**

Fixes: #24320

## **Manual testing steps**

See issue for STRs

## **Screenshots/Recordings**

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

### **Before**

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

### **After**

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

## **Pre-merge author checklist**

- [ ] 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.

## **Pre-merge reviewer checklist**

- [ ] 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.
@danjm danjm force-pushed the Version-v11.14.4 branch from b9dfff4 to 16b8ba4 Compare May 1, 2024 13:45
@metamaskbot
Copy link
Copy Markdown
Collaborator

Builds ready [16b8ba4]
Page Load Metrics (1037 ± 514 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint70144972010
domContentLoaded9331963
load57241610371071514
domInteractive9331963
Bundle size diffs [🚀 Bundle size reduced!]
  • background: 266.78 KiB (7.79%)
  • ui: 779.7 KiB (12.21%)
  • common: -784.63 KiB (-13.24%)

@Gudahtt Gudahtt marked this pull request as ready for review May 1, 2024 14:37
@Gudahtt Gudahtt requested review from a team, brad-decker and kumavis as code owners May 1, 2024 14:37
@Gudahtt
Copy link
Copy Markdown
Member

Gudahtt commented May 1, 2024

I have manually tested the steps outlined in #24320 and can confirm that this fixes the issue by removing the Edit button from the confirmation screen.

@Gudahtt Gudahtt merged commit b3949d9 into master May 1, 2024
@Gudahtt Gudahtt deleted the Version-v11.14.4 branch May 1, 2024 14:59
@github-actions github-actions bot locked and limited conversation to collaborators May 1, 2024
@metamaskbot metamaskbot added the release-11.14.4 Issue or pull request that will be included in release 11.14.4 label May 1, 2024
@bschorchit
Copy link
Copy Markdown
Contributor

I also manually tested this and confirmed the issue was fixed.

Edit button is no longer visible on safeTransferFrom requests:
image

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.14.4 Issue or pull request that will be included in release 11.14.4

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants