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

Master sync following v11.1.0 #21075

Merged
merged 27 commits into from
Sep 27, 2023
Merged

Master sync following v11.1.0 #21075

merged 27 commits into from
Sep 27, 2023

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Sep 27, 2023

No description provided.

danjm and others added 27 commits September 6, 2023 06:57
…ttons (#20767)

* shows MMI buttons and hides the Buy and Bridge buttons

* minor update
* allow NFTs content view

* prettier

* Update app/_locales/en/messages.json

Co-authored-by: Nidhi Kumari <[email protected]>

---------

Co-authored-by: Nidhi Kumari <[email protected]>
Deleting line "The recipient's hexadecimal address is shown in the activity list item." as the hexadecimal address is not supposed to be shown in the activity list item unless you open the activity list item, in the next step.
…0748)

I made a mistake in a suggestion on PR #20168, and Mark Stacey noticed it.  This PR fixes it.
* Skip first character in snap name if it is a @

* Simplify implementation
* Update `useScrollRequired` to only require to scroll to bottom one time

* remove console.log

* simplify logic

* add comment about magic number
The `metamaskbot` comment on each PR now includes links to MMI builds.

This relates to #20782
MMI builds are now published alongside stable releases, in the same
manner as Flask. They will be included in future GitHub release pages,
and tracked using separate git tags. Sentry sourcemaps are uploaded for
them during the release process as well.

Closes #20782
* Bump LavaMoat and SES

* Use latest versions

* Use [email protected]

* Update LavaMoat policies

* Unpin LavaMoat versions

* update lavamoat build policy

* Fix LavaMoat patch

* Update LavaMoat policies

---------

Co-authored-by: Frederik Bolding <[email protected]>
Co-authored-by: MetaMask Bot <[email protected]>
Co-authored-by: legobt <[email protected]>
* Fix #20910 - Turn off ENS resolution if IPFS is turned off

* Updated WIP

* Implement conditions for ENS and IPFS settings

* Remove initial fix

* Fix e2es
* updated placeholder for erc-1155 image

* removed code duplication

* updated collections

* updated snapshot

* updated stories

* updated condition from includes to startsWith

* Use startsWith instead of includes

---------

Co-authored-by: Danica Shen <[email protected]>
Co-authored-by: David Walsh <[email protected]>
Co-authored-by: chloeYue <[email protected]>
* Fix copy and add 3rd party API links

* Extract uppercase logic into a variable

* Fix snapshot tests

* fix e2e test

* fix lint error
…ts on the same client (#20973)

* fix incoming tx filtering

* tweak filtering

* tweak filtering

* tweak filtering

* tweak filtering

* refactor filtering on activity list

* simplify solution

* update comment

* reintroduce filtering and address comments

* fix linting errors

* fix test

* fix comment

* wip

* wip
This PR is to show the NFT Default image when the Image is hosted on
OpenSea but display Media is off

Further Context [slack message

](https://consensys.slack.com/archives/C029JG63136/p1695634003818569?thread_ts=1693992718.193729&cid=C029JG63136)

1. When IPFS is enabled:
- If NFT image relies on IPFS storage show the NFT
- If NFT image relies on OpenSea and OpenSea toggle is ON, show NFT
- If NFT image relies on OpenSea and OpenSea toggle is OFF, show Default
Image without the show Button.
- If both the toggles are on, show NFT

2. When IPFS is disabled:
- If the NFT image relies on IPFS storage, show Default Image with the
show Button.
- If the NFT image relies on OpenSea and OpenSea toggle is ON, show NFT
- If the NFT image relies on OpenSea and OpenSea toggle is OFF, show
Default Image without the show Button

_Fixes
[https://github.com/MetaMask/MetaMask-planning/issues/1330](#https://github.com/MetaMask/MetaMask-planning/issues/1330)

- [x] I’ve followed [MetaMask Coding
Standards](https://github.com/MetaMask/metamask-extension/blob/develop/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've clearly explained:
  - [x] What problem this PR is solving.
  - [x] How this problem was solved.
  - [x] How reviewers can test my changes.
- [x] I’ve indicated what issue this PR is linked to: Fixes #???
- [ ] I’ve included tests if applicable.
- [ ] I’ve documented any added code.
- [ ] 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)).
- [ ] I’ve properly set the pull request status:
  - [ ] In case it's not yet "ready for review", I've set it to "draft".
- [ ] In case it's "ready for review", I've changed it from "draft" to
"non-draft".

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

---------

Co-authored-by: Dan J Miller <[email protected]>
Co-authored-by: Brad Decker <[email protected]>
@danjm danjm requested a review from a team as a code owner September 27, 2023 15:20
@github-actions
Copy link
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.

Copy link
Member

@Gudahtt Gudahtt left a comment

Choose a reason for hiding this comment

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

LGTM!

@metamaskbot
Copy link
Collaborator

Builds ready [413ff9a]
Page Load Metrics (1041 ± 367 ms)
PlatformPageMetricMin (ms)Max (ms)Average (ms)StandardDeviation (ms)MarginOfError (ms)
ChromeHomefirstPaint891641162210
domContentLoaded731611082412
load8519221041765367
domInteractive731611082412
Bundle size diffs
  • background: 0 Bytes (0.00%)
  • ui: 0 Bytes (0.00%)
  • common: 0 Bytes (0.00%)

@codecov
Copy link

codecov bot commented Sep 27, 2023

Codecov Report

All modified lines are covered by tests ✅

Comparison is base (89c40cb) 68.38% compared to head (413ff9a) 68.38%.
Report is 4 commits behind head on develop.

Additional details and impacted files
@@           Coverage Diff            @@
##           develop   #21075   +/-   ##
========================================
  Coverage    68.38%   68.38%           
========================================
  Files         1008     1008           
  Lines        40288    40288           
  Branches     10779    10779           
========================================
  Hits         27548    27548           
  Misses       12740    12740           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@danjm danjm merged commit cc2880d into develop Sep 27, 2023
9 of 10 checks passed
@danjm danjm deleted the master-sync branch September 27, 2023 18:43
@github-actions github-actions bot locked and limited conversation to collaborators Sep 27, 2023
@metamaskbot metamaskbot added the release-11.3.0 Issue or pull request that will be included in release 11.3.0 label Sep 27, 2023
@danjm danjm removed the release-11.3.0 Issue or pull request that will be included in release 11.3.0 label Sep 28, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.