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.

Sign up for GitHub

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

Jump to bottom

feat: 7.33.0 #11616

Merged
merged 50 commits into from
Oct 25, 2024
Merged

feat: 7.33.0 #11616

merged 50 commits into from
Oct 25, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Oct 4, 2024 •
edited by sethkfman
Loading

This is the release candidate for version 7.33.0. The changelog will be found in another PR chore/7.33.0-Changelog.

Team sign-off checklist

  • team-security
  • team-platform
  • team-snaps-platform
  • team-sdk
  • team-assets
  • team-notifications
  • team-confirmations
  • team-design-system
  • team-tiger
  • team-wallet-framework
  • team-stake
  • team-accounts

Reference

metamaskbot and others added 2 commits October 4, 2024 02:29
@metamaskbot
7.33.0
22e44c2
@github-actions @metamaskbot @Cal-L
chore: chore/7.33.0-Changelog (#11617)
f178cd0 
This is PR updateds the change log for 7.33.0 and generates the test
plan here
[commit.csv](https://github.com/MetaMask/metamask-mobile/blob/release/7.33.0/commits.csv)

---------

Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Cal-L <cleun007@gmail.com>
@chrisleewilcox chrisleewilcox added the QA in Progress QA has started on the feature. label Oct 4, 2024
@NicolasMassart @Cal-L @github-actions
chore: merge 7.32.0 in 7.33.0 and bump build (#11677)
22d1a59 
Merge 7.32.0 back in 7.33.0
bump build to 1451

---------

Co-authored-by: Cal Leung <cal.leung@consensys.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
@github-actions GitHub Actions
Copy link
Contributor Author

github-actions bot commented Oct 8, 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.

github-actions bot and others added 6 commits October 8, 2024 16:08
@github-actions @elefantel @NicolasMassart
chore: cherry-pick #11595 (#11683)
06cf1b6 
This PR cherry-picks #11595

Co-authored-by: Mpendulo Ndlovu <mpendulo@elefantel.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@github-actions @elefantel @NicolasMassart
chore: cherry-pick #11603 (#11682)
8bc683c 
This PR cherry-picks #11603

Co-authored-by: Mpendulo Ndlovu <mpendulo@elefantel.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@github-actions @elefantel @NicolasMassart
chore: cherry-pick #11592 (#11684)
57d3a57 
This PR cherry-picks #11592

Co-authored-by: Mpendulo Ndlovu <mpendulo@elefantel.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@sahar-fehri @gambinish
chore: cherry-pick #11631 (#11702)
58d08f1 
This PR cherry-picks
#11631

Co-authored-by: Nick Gambino <35090461+gambinish@users.noreply.github.com>
@NicolasMassart
chore: bump to version 1454 (#11738)
c132256 
Bump version to 1454 for 7.33.0 RC-3
@NicolasMassart @bergeron
chore: cherry-pick #11718 (#11739)
db2d2c6 
This PR cherry-picks #11718

Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
@anaamolnar
Copy link

anaamolnar commented Oct 11, 2024 •
edited
Loading

Testing Android V7.33.0
Testing on Samsung A53
Onboarding: custom ETH mainnet

✅ Scenario Outline: Verifying the custom mainnet screen appears
✅ Scenario Outline: Entering an invalid mainnet RPC URL
✅ Scenario Outline: Entering a valid mainnet RPC URL
✅ Scenario Outline: Editing a custom mainnet URL on the settings and privacy view
✅ Scenario Outline: Deleting a custom mainnet URL on the settings and privacy view

Recording: https://drive.google.com/file/d/1dCQfDgVQzx_IMA7-d3kyw0AfaTX1QEO5/view?usp=sharing

Setting: Browser Regression

✅ Browser Scenario 1: Browser Invalid URL
✅ Browser Scenario 2: Navigation with browser controls.
✅ Browser Scenario 3: ENS website loads correctly.
✅ Browser Scenario 4: From the browser, I can successfully upload a picture
✅ Browser Scenario 5: Address bar
✅ Browser Scenario 6: Adding browser Favorites
✅ Browser Scenario 7: Browser Options Menu
✅ Browser Scenario 8: Visiting a malicious website prompts the user with the phishing detection warning
✅ Browser Scenario 9: Navigate to opensea.io, rarible.com, pancakeswap.finance, app.uniswap.org and connect

I took the liberty of modifying some of the test cases because portfolio.metamask.io is the home page now, so it requires manually navigating to home.metamask.io
Given that this page will no longer be used, and that is where the favorites list lies, I wonder how this feature will look moving forward.

Recording: https://drive.google.com/file/d/1fH4dXdvFbGqpxI9aZ44R6FeJp-fff8Eo/view?usp=drive_link

Dapp Connection
✅ Connect Wallet to Dapp or Marketplace

Recording: https://drive.google.com/file/d/1fH4dXdvFbGqpxI9aZ44R6FeJp-fff8Eo/view?usp=drive_link

Network Regression
✅ Scenario 1.1: I can remove a custom network (Palm) that was added via the popular network flow
✅ Scenario 1.2: I can remove a custom network that was added via the custom network flow
✅ Scenario 2: Adding a network via a Dapp
✅ Scenario 3: Adding a network via the new popular network flow
✅ Scenario 4: Adding a network via the custom network flow
✅ Scenario 5: Adding a custom network and editing the network

Recording: https://drive.google.com/file/d/1iNRWM35Gl2mL-dYEzeKwcgBtdQWpvEac/view?usp=drive_link

Setting: General view

✅ Scenario: Changing the device language from English to Russian
✅ Scenario: Changing the app language from English to Filipino

Recordings:
https://drive.google.com/file/d/1QXAsnvaGkFQf9XrAIfb-RJjnrfylIIUm/view?usp=drive_link
https://drive.google.com/file/d/1rRtTiCfshkwkmVc-xMOc9qEuixcEqpBR/view?usp=drive_link

QR Scanner Regression

✅ From the in-app camera I should be able to scan a valid QR code containing an address:
✅ I should be able to use the QR scanner on the send flow to scan an address:
https://drive.google.com/file/d/1qAXDAZkLOV5U3mfl7VXhWpI64RQDETJO/view?usp=drive_link
✅ When I scan a dapp QR code using the in-app camera I should see the appropriate warning message:
https://drive.google.com/file/d/1Bm0uk2fuJUU0Z_f6AslkHuyNKDLkvrh2/view?usp=drive_link
✅ When I scan a dapp QR code using the QR scanner on the send flow I should see the appropriate error message:
https://drive.google.com/file/d/17SRowWsGOLb2k8iLcjfEY4GxIrtvoLwn/view?usp=drive_link
✅ When I scan an invalid address QR code using the QR scanner on the send flow I should see the appropriate warning message (the message flickers):
https://drive.google.com/file/d/1LJ5KW_ESLqf-BsRu1_REroNtLlvlL25z/view?usp=drive_link
✅ A user can scan a private key QR code using the in-app camera to import an account:
https://drive.google.com/file/d/1MNzlMecDdgkLfrS5fjChXk2QiMfi1JKb/view?usp=drive_link
✅ User scans MMM Receive QR code
https://drive.google.com/file/d/1ooGcZsOX3i0wfdW-w5A9KpQnUCZ9sc47/view?usp=drive_link

@Lansky825
Copy link

Testing IOS v.7.33.0 (1451) on iPhone 15

General view

✅ Scenario: Changing the device language from English to Russian
✅ Scenario: Changing the app language from English to Filipino

Recordings:
https://drive.google.com/file/d/1_Ca09ZGBTOH4T1ZzYbtbBc8YBB5_3I9M/view?usp=sharing
https://drive.google.com/file/d/10WAKGkJhLD4lFxdZfNEIkVT_Lw_VDcH2/view?usp=sharing

QR Scanner Regression

✅ From the in-app camera I should be able to scan a valid QR code containing an address:
✅ I should be able to use the QR scanner on the send flow to scan an address:
✅ When I scan a dapp QR code using the in-app camera I should see the appropriate warning message:
✅ When I scan a dapp QR code using the QR scanner on the send flow I should see the appropriate error message:
✅ When I scan an invalid address QR code using the QR scanner on the send flow I should see the appropriate warning message:
✅ A user can scan a private key QR code using the in-app camera to import an account:
✅ User scans MMM Receive QR code on different network:
✅Chain ID 1 not found error when scanning Eth receive QR from another network

Recordings:
https://drive.google.com/drive/folders/1jkB-x78in_McXO-ADFMQccA7_Bnh_IKs?usp=sharing

Onboarding: custom ETH mainnet

✅ Scenario Outline: Verifying the custom mainnet screen appears
✅ Scenario Outline: Entering an invalid mainnet RPC URL
✅ Scenario Outline: Entering a valid mainnet RPC URL
✅ Scenario Outline: Editing a custom mainnet URL on the settings and privacy view
I noticed that after typing the new RPC URL the 'Save' button stays grey, but if you tap on it once, it becomes functional
✅ Scenario Outline: Deleting a custom mainnet URL on the settings and privacy view

Recordings:
https://drive.google.com/file/d/1LN_wMBZed0pU8-9ytXH1ZXimjtR4KS0y/view?usp=sharing
https://drive.google.com/file/d/14zQTaTHBECvq7JB0tnMO6pGxOVVoCaxz/view?usp=sharing

Browser Regression

✅ Browser Scenario 1: Browser Invalid URL
✅ Browser Scenario 2: Navigation with browser controls.
✅ Browser Scenario 3: ENS website loads correctly.
✅ Browser Scenario 4: From the browser I can successfully upload a picture
✅ Browser Scenario 5: Address bar
✅ Browser Scenario 6: Adding browser Favorites
✅ Browser Scenario 7: Browser Options Menu
✅ Browser Scenario 8: Visiting a malicious website prompts the user with the phishing detection warning
✅ Browser Scenario 9: Navigate to opensea.io, rarible.com, pancakeswap.finance, app.uniswap.org and connect

Recordings
https://drive.google.com/drive/folders/1HPu--9VcClQo_S9DaRrBopVoyMvy-4_O?usp=sharing

Dapp Connection

✅ Connect Wallet to Dapp or Marketplace

Recording:
https://drive.google.com/file/d/1xLlbOAhoIFT8tG9vsZsshbZHvdizXV5n/view?usp=sharing

Network Regression

✅ Scenario 1.1: I can remove a custom network (Palm) that was added via the popular network flow
✅ Scenario 1.2: I can remove a custom network that was added via the custom network flow
✅ Scenario 2: Adding a network via a Dapp
✅ Scenario 3: Adding a network via the new popular network flow
✅ Scenario 4: Adding a network via the custom network flow
✅ Scenario 5: Adding a custom network and editing the network
⚠️ There is a red sign(the same as the sign that appears on the Test networks) near the MATIC balance on the main screen. After editing the currency from MATIC to POL the red sign disappears.
Image
✅ Scenario 6: Editing a popular network

Recordings:
https://drive.google.com/drive/folders/1PZ6f8GQYKYrPHdsvj3H_K0-AmnFYqr-C?usp=sharing

NicolasMassart and others added 5 commits October 14, 2024 19:24
@NicolasMassart
Bump version to 1456 for 7.33.0 RC-4 (#11784)
c774787 
Bump version to 1456 for 7.33.0 RC-4
@runway-github @wachunei
chore(runway): cherry-pick chore(ramp): upgrade sdk to 1.28.5 (#11790)
3e564e1 
- chore(ramp): upgrade sdk to 1.28.5 (#11788)

<!--
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.
-->

## **Description**

- update on-ramp-sdk to version 1.28.5, which removes a unused
dependency

## **Related issues**

Fixes: [dependency

issue](https://github.com/MetaMask/metamask-mobile/actions/runs/11332800511/job/31515686025?pr=11787)

## **Manual testing steps**

- go to buy crypto
- request a quote
- quote should be provided

## **Screenshots/Recordings**

N/A

### **Before**

N/A

### **After**

N/A

## **Pre-merge author checklist**

- [x] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [x] I've completed the PR template to the best of my ability
- [x] I’ve included tests if applicable
- [x] I’ve documented my code using [JSDoc](https://jsdoc.app/) format
if applicable
- [x] I’ve applied the right labels on the PR (see [labeling

guidelines](https://github.com/MetaMask/metamask-mobile/blob/main/.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.
[4f8f66c](4f8f66c)

Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
@sethkfman @NicolasMassart
chore: cherry pick 6db794f (#11791)
93ec320 
## **Description**

Cherry pick for #11785 

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.

Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@github-actions @NicolasMassart @sethkfman
chore: cherry-pick #11760 (#11773)
edba913 
This PR cherry-picks #11760

Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
@sethkfman
bump version 1458
e7ae695
@chrisleewilcox chrisleewilcox added QA Passed A successful QA run through has been done and removed QA in Progress QA has started on the feature. labels Oct 15, 2024
runway-github bot and others added 10 commits October 16, 2024 18:10
@runway-github
chore(runway): cherry-pick chore: Update Sentry Performance Sampling …
165846c 
…utils.js (#11806)

cherry-pick chore: Update Sentry Performance Sampling utils.js (#11806)
@runway-github @tommasini
@MarioAslau @NicolasMassart
chore(runway): cherry-pick fix: persist token and phishing list (#11807)
8581bbc 
cherry-pick fix: persist token and phishing list #11802

Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Aslau Mario-Daniel <marioaslau@gmail.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@sethkfman @MarioAslau
chore: cherry pick 9ac1488 (#11822)
0556903 
## **Description**

 cherry pick 9ac1488

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.

Co-authored-by: Aslau Mario-Daniel <marioaslau@gmail.com>
@tommasini
chore: cherry pick tags for custom instrumentation (#11826)
97d4640 
---------

Co-authored-by: Cal Leung <cal.leung@consensys.net>
Co-authored-by: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com><!--
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.
-->

## **Description**
cherry pick tags
[PR](#11623) to the
7.33.0

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.
@sethkfman
Bump build version 1459 RC - 6
9d54b08
@tommasini
chore: Revert custom span (#11839)
392f8d0 
<!--
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.
-->

## **Description**
Revert this [PR](#11822)
<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.
@tommasini @sethkfman
chore: revert tags commit (#11838)
498e8a2 
## **Description**


Revert this PR: #11826

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.

Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
@sethkfman
bump build number 1460 RC-7
3481ea8
@runway-github @joaoloureirop
chore(runway): cherry-pick chore: bump ruby version to 3.1.6 (#11848)
f895d7a 
- chore: bump ruby version to 3.1.6 (#11846)

## **Description**

Our CI platform updated VM images which replaced ruby `3.1.5` with
`3.1.6`

<!--
Write a short description of the changes included in this pull request,
also include relevant motivation and context. Have in mind the following
questions:
1. What is the reason for the change?
2. What is the improvement/solution?
-->

## **Related issues**

Fixes: #11843

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding

Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.
[c0edf60](c0edf60)

Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
@sethkfman @bkirb
@legobeat @cortisiko @gambinish @NicolasMassart @jpuri @OGPoyraz @EtherWizard33 @vinnyhoward @SamuelSalas @tommasini @elefantel @cryptodev-2s @wachunei @Matt561 @github-actions @metamaskbot @runway-github @dawnseeker8 @vivek-consensys @MarioAslau @matthewwalsh0 @sahar-fehri @frankvonhoven @Cal-L @abretonc7s @Jonathansoufer @salimtb @Daniel-Cross @MajorLift @mikesposito @christopherferreira9 @joaoloureirop @AxelGes @brianacnguyen @amitabh94 @georgewrmarshall @bergeron @FrederikBolding @devin-ai-integration @vinistevam @Gudahtt @gauthierpetetin
chore: merge main 7.33.0 (#11850)
801d609 
## **Description**

This PR merges main into the release branch and resolved conflicts.

## **Related issues**

Fixes: NA

## **Manual testing steps**

1. NA
2.
3.

## **Screenshots/Recordings**


### **Before**

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

### **After**

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

## **Pre-merge author checklist**

- [ ] I’ve followed [MetaMask Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.

---------

Co-authored-by: Brendan Kirby <124314512+bkirb@users.noreply.github.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Curtis David <Curtis.David7@gmail.com>
Co-authored-by: Nick Gambino <35090461+gambinish@users.noreply.github.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: OGPoyraz <omergoktugpoyraz@gmail.com>
Co-authored-by: EtherWizard33 <165834542+EtherWizard33@users.noreply.github.com>
Co-authored-by: Vince Howard <vincenguyenhoward@gmail.com>
Co-authored-by: SamuelSalas <samuel.salas.reyes@gmail.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Mpendulo Ndlovu <mpendulo@elefantel.com>
Co-authored-by: cryptodev-2s <109512101+cryptodev-2s@users.noreply.github.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Matthew Grainger <46547583+Matt561@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: runway-github[bot] <73448015+runway-github[bot]@users.noreply.github.com>
Co-authored-by: Xiaoming Wang <7315988+dawnseeker8@users.noreply.github.com>
Co-authored-by: Vivek <106310394+vivek-consensys@users.noreply.github.com>
Co-authored-by: Xiaoming Wang <dawnseeker8@gmail.com>
Co-authored-by: Aslau Mario-Daniel <marioaslau@gmail.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
Co-authored-by: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com>
Co-authored-by: Cal Leung <cal.leung@consensys.net>
Co-authored-by: Cal-L <cleun007@gmail.com>
Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com>
Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
Co-authored-by: Jonathan Ferreira <44679989+Jonathansoufer@users.noreply.github.com>
Co-authored-by: Salim TOUBAL <salim.toubal@outlook.com>
Co-authored-by: Daniel Cross <dan.s.cross@icloud.com>
Co-authored-by: Jongsun Suh <jongsun.suh@icloud.com>
Co-authored-by: Michele Esposito <michele@esposito.codes>
Co-authored-by: Michele Esposito <34438276+mikesposito@users.noreply.github.com>
Co-authored-by: Christopher Ferreira <104831203+christopherferreira9@users.noreply.github.com>
Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
Co-authored-by: AxelGes <34173844+AxelGes@users.noreply.github.com>
Co-authored-by: Brian Nguyen <brianacnguyen@gmail.com>
Co-authored-by: Amitabh Aggarwal <aggarwal.amitabh@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com>
Co-authored-by: JSoufer <jonathan.ferreira@consensys.net>
Co-authored-by: devin-ai-integration[bot] <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Kylan Hurt <kylanhurt@users.noreply.github.com>
Co-authored-by: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com>
sethkfman
sethkfman previously approved these changes Oct 24, 2024
View reviewed changes
Copy link
Contributor

@sethkfman sethkfman left a comment

Choose a reason for hiding this comment

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

LGTM

@NicolasMassart
chore: update attribution (#11998)
10fb54d 
Update attribution file to hopefully allow merging release branch
tommasini
tommasini previously approved these changes Oct 24, 2024
View reviewed changes
Copy link
Contributor

@tommasini tommasini left a comment

Choose a reason for hiding this comment

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

LGTM!

@NicolasMassart NicolasMassart added Run Smoke E2E Triggers smoke e2e on Bitrise and removed Run Smoke E2E Triggers smoke e2e on Bitrise labels Oct 24, 2024
@github-actions GitHub Actions
Copy link
Contributor Author

github-actions bot commented Oct 24, 2024 •
edited by metamaskbot
Loading

https://bitrise.io/ Bitrise

✅✅✅ pr_smoke_e2e_pipeline passed on Bitrise! ✅✅✅

Commit hash: 10fb54d
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/49498c65-563a-45b1-ba78-e87663e39fd3

Note

  • You can kick off another pr_smoke_e2e_pipeline on Bitrise by removing and re-applying the Run Smoke E2E label on the pull request

@NicolasMassart @vinnyhoward
@legobeat @matthewwalsh0 @sahar-fehri @tommasini @amitabh94 @MarioAslau
Chore/merge main in release 7.33.0 (#11999)
23e04b3 
merge main into release/7.33.0 to allow final merge

---------

Co-authored-by: Vince Howard <vincenguyenhoward@gmail.com>
Co-authored-by: legobeat <109787230+legobeat@users.noreply.github.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Amitabh Aggarwal <aggarwal.amitabh@gmail.com>
Co-authored-by: Aslau Mario-Daniel <marioaslau@gmail.com>
Co-authored-by: tommasini <tommasini15@gmail.com>
@NicolasMassart NicolasMassart requested review from a team as code owners October 24, 2024 11:40
@sethkfman
Copy link
Contributor

sethkfman commented Oct 24, 2024 •
edited
Loading

@metamaskbot update-attributions

1 similar comment
@sethkfman
Copy link
Contributor

@metamaskbot update-attributions

@metamaskbot
Copy link
Collaborator

Attributions update failed. You can review the logs or retry the attributions update here

github-actions bot and others added 2 commits October 24, 2024 18:29
@github-actions @MarioAslau
@tommasini @NicolasMassart
chore: cherry-pick #11935 (#11982)
30b548c 
This PR cherry-picks #11935

---------

Co-authored-by: Aslau Mario-Daniel <marioaslau@gmail.com>
Co-authored-by: tommasini <tommasini15@gmail.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@sethkfman
fix: update attribution (#12009)
2bd26ce 
## **Description**

## **Related issues**

Fixes:

## **Manual testing steps**

1. Go to this page...
2.
3.

## **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 Contributor
Docs](https://github.com/MetaMask/contributor-docs) and [MetaMask Mobile
Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.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-mobile/blob/main/.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.
sethkfman
sethkfman approved these changes Oct 24, 2024
View reviewed changes
Copy link
Contributor

@sethkfman sethkfman left a comment

Choose a reason for hiding this comment

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

LGTM

@sethkfman sethkfman disabled auto-merge October 25, 2024 16:08
@sethkfman sethkfman enabled auto-merge October 25, 2024 16:09
@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
100.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@sethkfman sethkfman added this pull request to the merge queue Oct 25, 2024
Merged via the queue into main with commit 0460043 Oct 25, 2024
38 of 40 checks passed
@github-actions github-actions bot locked and limited conversation to collaborators Oct 25, 2024
@metamaskbot metamaskbot added the release-7.35.0 Issue or pull request that will be included in release 7.35.0 label Oct 25, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@NicolasMassart NicolasMassart NicolasMassart left review comments

@sethkfman sethkfman sethkfman approved these changes

@tommasini tommasini tommasini left review comments

Assignees
No one assigned
Labels
QA Passed A successful QA run through has been done release-7.35.0 Issue or pull request that will be included in release 7.35.0 Run Smoke E2E Triggers smoke e2e on Bitrise skip-sonar-cloud Only used for bypassing sonar cloud when failures are not relevant to the changes. team-mobile-platform
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@anaamolnar @Lansky825 @sethkfman @metamaskbot @NicolasMassart @codecov-commenter @tommasini @chrisleewilcox @sahar-fehri