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

7.16.0 #8464

Merged
merged 30 commits into from
Feb 28, 2024
Merged

7.16.0 #8464

merged 30 commits into from
Feb 28, 2024

Conversation

github-actions[bot]
Copy link
Contributor

This is the release candidate for version 7.16.0.

Copy link
Contributor Author

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.

@codecov-commenter
Copy link

codecov-commenter commented Jan 30, 2024

Codecov Report

Attention: 18 lines in your changes are missing coverage. Please review.

Comparison is base (0efe1c6) 40.60% compared to head (32dd416) 40.67%.
Report is 11 commits behind head on main.

Files Patch % Lines
app/components/Nav/App/index.js 0.00% 9 Missing ⚠️
...ents/Views/Settings/ExperimentalSettings/index.tsx 70.00% 2 Missing and 1 partial ⚠️
app/components/UI/PersonalSign/PersonalSign.tsx 71.42% 2 Missing ⚠️
app/components/UI/PaymentRequestSuccess/index.js 0.00% 1 Missing ⚠️
app/components/UI/ReceiveRequest/index.js 0.00% 1 Missing ⚠️
app/components/Views/AddressQRCode/index.js 0.00% 1 Missing ⚠️
...components/Views/Settings/GeneralSettings/index.js 0.00% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8464      +/-   ##
==========================================
+ Coverage   40.60%   40.67%   +0.06%     
==========================================
  Files        1239     1240       +1     
  Lines       29978    30012      +34     
  Branches     2868     2871       +3     
==========================================
+ Hits        12174    12206      +32     
  Misses      17107    17107              
- Partials      697      699       +2     

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

@metamaskbot metamaskbot added the release-7.16.0 Issue or pull request that will be included in release 7.16.0 label Jan 30, 2024
This PR cherry-picks #8413

Co-authored-by: LeoTM <1881059+leotm@users.noreply.github.com>
sethkfman and others added 2 commits January 30, 2024 15:30
## **Description**

cherry pick #8373 

## **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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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: LeoTM <1881059+leotm@users.noreply.github.com>
@metamaskbot metamaskbot mentioned this pull request Jan 30, 2024
13 tasks
This PR cherry-picks #8486

Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
@FoxxyMartin
Copy link

✅Scenario: Explore Sites
COMPLETE

✅Scenario: Favorites Add, click and delete favorites. Display favorites in the Favorites tab of home.metamask.io
COMEPLETE

✅Scenario: Homepage search
COMPLETE

✅Scenario: Address bar
COMPLETE

✅Scenario: Navigation with browser controls
COMPLETE

✅Scenario: Browser options
COMPLETE

✅Scenario: Switch account
COMPLETE

✅Scenario: A user can test an ENS website
Edit: COMPLETE - My internet is not working correctly loading certain sites.

✅Scenario: A user enters a malicilous website and is greeted with the phishing detection warning
COMPLETE

✅Scenario: A user enters an invalid url
COMPLETE
https://drive.google.com/file/d/1UwvU6Gtn7IiPCi4CyyvYrz044erdajJY/view?usp=sharing

✅Scenario Outline: From the in-app camera I should be able to scan a valid QR code containing an address
COMPLETE

✅Scenario Outline: I should be able to use the QR scanner on the send flow to scan an address
COMPLETE

✅Scenario Outline: When I scan a dapp QR code using the in-app camera I should see the appropriate warning message.
COMPLETE

Scenario Outline: When I scan a dapp QR code using the QR scanner on the send flow I should see the appropriate error message.
FAILED- no error message loaded.

✅Scenario Outline: When I scan an invalid address QR code using the QR scanner on the send flow I should see the appropriate warning message.
COMPLETE
https://drive.google.com/file/d/1rlb9p70Srcc14-lManKfHaK6NRIwWFPr/view?usp=drive_link

✅Scenario: A user can scan a private key QR code using the in-app camera to import an account
COMPLETE

✅Scenario: User scans MMM Receive QR code on different network
COMPLETE
https://drive.google.com/file/d/1BjmyvB2gQ491jD901AtCZ2dMnFJFGbB4/view?usp=drive_link

✅Sceanrio: General View
COMPLETE

I have never been able to use Filipino language on my phone for most apps.
Even in prior testing.
https://recordit.co/CEnHUiXWq7

RemoveNetwork.feature - ✅Completed
https://recordit.co/SWleSF1lP8

AddNetworkViaDapp.feature - ✅Completed
https://recordit.co/kXvS89sJMo

AddPopularNetwork.feature - ✅Completed
https://recordit.co/FYmTQeEYlG

AddCustomNetwork.feature\ - ✅Completed
https://recordit.co/NWs5GG98XE

EditCustomNetworks.feature - ✅Completed
https://recordit.co/zA3DiWpNtT

EditPopularNetwork.feature -✅ Completed
http://recordit.co/iQFKm1wLJ3

✅ Custom main net Scenario 1 (Verifying Custom Mainnet Screen Appears):

✅ Custom main net Scenario 2 (Entering an Invalid Mainnet RPC URL):

✅ Custom main net Scenario 3 (Entering a valid Mainnet RPC URL):

✅ Custom main net Scenario 4 (Editing a custom main net URL on the settings and privacy view):

✅ Custom main net Scenario 5 (Deleting a custom mainnet URL on the settings and privacy view):
https://recordit.co/ipGYSYbL1c

github-actions bot and others added 2 commits February 1, 2024 12:59
This PR cherry-picks #8157

Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
This PR cherry-picks #8491

Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
This PR cherry-picks #8469

Co-authored-by: Omri Dan <61094771+omridan159@users.noreply.github.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
@DanielTech21
Copy link

Onboarding: Custom ETH Mainnet:
✅ Custom main net Scenario 1 (Verifying Custom Mainnet Screen Appears):
https://drive.google.com/file/d/1FiTM1ZupJzxa0tOXDH3-vMYJCB3k_MGr/view?usp=sharing
✅ Custom main net Scenario 2 (Entering an Invalid Mainnet RPC URL):
https://drive.google.com/file/d/1I38Nj6GfEiMzvzog8fH9LhjAT0ktNHUP/view?usp=sharing
✅ Custom main net Scenario 3 (Entering a valid Mainnet RPC URL):
https://drive.google.com/file/d/1aMVpECb3vtX9_0pe2qAt4JwDCtLQn6wT/view?usp=sharing
✅ Custom main net Scenario 4 (Editing a custom main net URL on the settings and privacy view):
FAILED - ''Could not fetch chain ID'' error even if correct
https://drive.google.com/file/d/10ID_nhtoGXEPmUhkeelAlhChot-t6Kgh/view?usp=sharing
✅ Custom mainnet Scenario 5 (Deleting a custom mainnet URL on the settings and privacy view):
https://drive.google.com/file/d/1J_g2WPUNGx49lC-G5Ew9pWsLHQnBFBMT/view?usp=sharing

QR Scanner Regression
✅ From the in-app camera, I should be able to scan a valid QR code containing an address.
https://drive.google.com/file/d/1u4m34B7i1iDvxJpESKy2HpMzPcOZzJoc/view?usp=sharing
✅ I should be able to use the QR scanner on the send flow to scan an address
https://drive.google.com/file/d/1qxGSZwlDw0zrgBHY6uG1qnD0LA-BDQ7w/view?usp=sharing
✅ 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/1tFoFlXY9sI88VjP251NHmU7Zg3vsIHB5/view?usp=sharing
✅ When I scan an invalid address QR code using the in-app camera, I should see the appropriate warning message.
https://drive.google.com/file/d/1ZtkQhtrxn6Ihx6N6CuzrtIp0BxoQi-7p/view?usp=sharing
✅ A user can scan a private key QR code using the in-app camera to import an account
https://drive.google.com/file/d/1-bd-hxFpzs0QbzxPE-mqc1gIaC28xvxl/view?usp=sharing
✅ User scans MMM Receive QR code on different network
https://drive.google.com/file/d/18VjMae77wuEckqGLDa5j3QlOnB_mfN7Z/view?usp=sharing

Network Regression
✅ RemoveNetwork.feature - Completed
https://drive.google.com/file/d/1vxXUkHdg2b6IuJQMf66i7QSLLI-NGw2w/view?usp=sharing
✅ AddNetworkViaDapp.feature - Completed
https://drive.google.com/file/d/1vkdA-0IpmeW-S_puEMs9fyZ_XUC9ANUA/view?usp=sharing
✅ AddPopularNetwork.feature - Completed
https://drive.google.com/file/d/1sMegtdMVuJLrHotrBCQjMGmK07PSYXyR/view?usp=sharing
✅ AddCustomNetwork.feature\ - Completed
https://drive.google.com/file/d/1lkeUjCKXKT9VbUXbjN41lpv78KeXd68e/view?usp=sharing
✅ EditCustomNetworks.feature - Completed
https://drive.google.com/file/d/1vPJi-LvPaDvx4N7XtM-OQlCBhMf1QqU-/view?usp=sharing
✅ EditPopularNetwork.feature - Completed
https://drive.google.com/file/d/1vgHsbQ_HOA-zWtSncjw4hgMAJsL6h_9o/view?usp=sharing

Browser Regression
Scenario: Explore Sites
✅COMPLETE
https://drive.google.com/file/d/184iwLSZ2GPEgISwaQGI5_m_jAG8k69yK/view?usp=sharing
Scenario: Favorites Add, click and delete favourites. Display favourites in the Favorites tab of home.metamask.io
✅COMPLETE
https://drive.google.com/file/d/1vG69VZk3loeAy0xwUJUb-UEo6wxDSCyg/view?usp=sharing
Scenario: Address bar
✅COMPLETE
https://drive.google.com/file/d/1fHoXttvVKz3e0j4erF9KqmbEVyPn8wl1/view?usp=sharing
Scenario: Navigation with browser controls
✅COMPLETE
https://drive.google.com/file/d/1_dbGfOLghVmKCNwiV9EMWXhyYZ3ngtAB/view?usp=sharing
Scenario: Browser options
✅COMPLETE
https://drive.google.com/file/d/1_dbGfOLghVmKCNwiV9EMWXhyYZ3ngtAB/view?usp=sharing
Scenario: Switch account
✅COMPLETE
https://drive.google.com/file/d/132wqtA4OobogZybRJA5E2idNUxZuXFiN/view?usp=sharing
Scenario: A user can test an ENS website
✅COMPLETE
https://drive.google.com/file/d/1j8F_kihtQ-eHqlOvZLqCip3mcDhpnsRi/view?usp=sharing
Scenario: A user enters a malicious website and is greeted with the phishing detection warning
✅COMPLETE
https://drive.google.com/file/d/14_BnOdjo_sKalv-1iZb2WaEBQLgj30Fn/view?usp=sharing
Scenario: A user enters an invalid URL
✅COMPLETE
https://drive.google.com/file/d/1o5LZQO9-iUPLe9H1YJCUf7UhBfx8sXNS/view?usp=sharing

Change Langauge Feature
✅ Setting up your device to Russian
https://drive.google.com/file/d/1hYcCupCPsEydQChZ3fCxOyH9R6BjIH7t/view?usp=sharing
✅ MM is set up in Filipino
https://drive.google.com/file/d/1vRxq5Jp5jdhZXb1eHd_j1oS_qqQaomVz/view?usp=sharing

github-actions bot and others added 2 commits February 1, 2024 10:36
This PR cherry-picks #8503

Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
This PR cherry-picks #8504

Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
Co-authored-by: Cal Leung <cleun007@gmail.com>
Copy link

sonarcloud bot commented Feb 1, 2024

Quality Gate Passed Quality Gate passed

Kudos, no new issues were introduced!

0 New issues
0 Security Hotspots
No data about Coverage
No data about Duplication

See analysis details on SonarCloud

## **Description**
Version bump 1265
<!--
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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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>
@seaona
Copy link
Contributor

seaona commented Feb 19, 2024

🟢 QA Sign Off from Confirmations UX team

  • ✔️ Blockaid is working for Multiple networks
  • ✔️ Breaking change from geth (infura) is fixed and working correctly with the last ppom patch
  • ✔️ Performance improvements are noticeable compared to the previous version
  • What's New announcement
    • ✔️ For new installs, it's displayed correctly with the updated copy (network supports)
    • 🟡 For migrations, it won't appear - bug opened here . Not a blocker, and fixed for the next RC 7.17
multinet-support.mp4
ppom-update-fix-mobile.mp4

Screenshot from 2024-02-19 18-00-03

Cal-L and others added 3 commits February 22, 2024 11:20
## **Description**

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

Fix merge conflicts with main for `release/7.16.0` branch

## **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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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.
## **Description**

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

Revert merge from main for 7.16.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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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.
## **Description**

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

Merge conflicts from main

## **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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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: LeoTM <1881059+leotm@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: Omri Dan <61094771+omridan159@users.noreply.github.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
Co-authored-by: Olusegun Akintayo <akintayo.segun@gmail.com>
Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Mike B <32695229+plasmacorral@users.noreply.github.com>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: Nicholas Ellul <nicholas.ellul1@gmail.com>
Co-authored-by: salimtb <salim.toubal@outlook.com>
Co-authored-by: CW <chris.wilcox@consensys.net>
Co-authored-by: Xiaoming Wang <dawnseeker8@gmail.com>
Co-authored-by: Sébastien Van Eyck <sebastien.vaneyck@consensys.net>
Co-authored-by: Sébastien Van Eyck <sebastien.vaneyck@gmail.com>
Co-authored-by: OGPoyraz <omergoktugpoyraz@gmail.com>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Co-authored-by: SamuelSalas <samuel.salas.reyes@gmail.com>
Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Co-authored-by: João Tavares <joao.tavares@consensys.net>
Co-authored-by: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com>
Co-authored-by: João Loureiro <1649425+jpcloureiro@users.noreply.github.com>
Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com>
Co-authored-by: witmicko <witmicko@users.noreply.github.com>
Co-authored-by: Derek Brans <dbrans@gmail.com>
Co-authored-by: Curtis David <Curtis.David7@gmail.com>
Co-authored-by: Owen Craston <owen.craston@consensys.net>
@Cal-L Cal-L changed the base branch from main to l10n_crowdin_action February 22, 2024 20:06
@Cal-L Cal-L changed the base branch from l10n_crowdin_action to main February 22, 2024 20:06
@Cal-L Cal-L marked this pull request as ready for review February 22, 2024 20:08
@Cal-L Cal-L requested review from a team as code owners February 22, 2024 20:08
## **Description**

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

Fix more merge conflicts with main on 7.16.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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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: LeoTM <1881059+leotm@users.noreply.github.com>
Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com>
Co-authored-by: sethkfman <seth.kaufman@consensys.net>
Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
Co-authored-by: sahar-fehri <sahar.fehri@consensys.net>
Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com>
Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net>
Co-authored-by: Omri Dan <61094771+omridan159@users.noreply.github.com>
Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com>
Co-authored-by: Olusegun Akintayo <akintayo.segun@gmail.com>
Co-authored-by: Brian Bergeron <brian.e.bergeron@gmail.com>
Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com>
Co-authored-by: Mike B <32695229+plasmacorral@users.noreply.github.com>
Co-authored-by: Jyoti Puri <jyotipuri@gmail.com>
Co-authored-by: George Marshall <george.marshall@consensys.net>
Co-authored-by: Sylva Elendu <iamsylvaelendu@gmail.com>
Co-authored-by: Nicholas Ellul <nicholas.ellul1@gmail.com>
Co-authored-by: salimtb <salim.toubal@outlook.com>
Co-authored-by: CW <chris.wilcox@consensys.net>
Co-authored-by: Xiaoming Wang <dawnseeker8@gmail.com>
Co-authored-by: Sébastien Van Eyck <sebastien.vaneyck@consensys.net>
Co-authored-by: Sébastien Van Eyck <sebastien.vaneyck@gmail.com>
Co-authored-by: OGPoyraz <omergoktugpoyraz@gmail.com>
Co-authored-by: Mark Stacey <markjstacey@gmail.com>
Co-authored-by: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com>
Co-authored-by: SamuelSalas <samuel.salas.reyes@gmail.com>
Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com>
Co-authored-by: João Tavares <joao.tavares@consensys.net>
Co-authored-by: Frank von Hoven <141057783+frankvonhoven@users.noreply.github.com>
Co-authored-by: João Loureiro <1649425+jpcloureiro@users.noreply.github.com>
Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com>
Co-authored-by: witmicko <witmicko@users.noreply.github.com>
Co-authored-by: Derek Brans <dbrans@gmail.com>
Co-authored-by: Curtis David <Curtis.David7@gmail.com>
Co-authored-by: Owen Craston <owen.craston@consensys.net>
@Cal-L Cal-L closed this Feb 22, 2024
@github-actions github-actions bot locked and limited conversation to collaborators Feb 22, 2024
@Cal-L Cal-L reopened this Feb 22, 2024
Cal-L and others added 2 commits February 22, 2024 12:32
## **Description**

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

Revert conflict comments on 7.16.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 Coding
Standards](https://github.com/MetaMask/metamask-mobile/blob/main/.github/guidelines/CODING_GUIDELINES.md).
- [ ] I've clearly explained what problem this PR is solving and how it
is solved.
- [ ] I've linked related issues
- [ ] I've included manual testing steps
- [ ] I've included screenshots/recordings if applicable
- [ ] 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.
- [ ] 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".

## **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.
Cal-L
Cal-L previously approved these changes Feb 26, 2024
Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@Cal-L Cal-L left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Contributor

@georgewrmarshall georgewrmarshall left a comment

Choose a reason for hiding this comment

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

LGTM! Not sure why we are code owners on this.

@sethkfman sethkfman merged commit 224f737 into main Feb 28, 2024
28 of 29 checks passed
@metamaskbot metamaskbot added the release-7.18.0 Issue or pull request that will be included in release 7.18.0 label Feb 28, 2024
@sethkfman
Copy link
Contributor

Screenshot 2024-02-28 at 4 58 22 PM

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-7.16.0 Issue or pull request that will be included in release 7.16.0 release-7.18.0 Issue or pull request that will be included in release 7.18.0 team-mobile-platform
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants