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

fix: cp-7.42.0 Confirm ScrollView and readd drag down and backdrop click to close #13913

Merged
merged 2 commits into from
Mar 7, 2025

Conversation

digiwand
Copy link
Contributor

@digiwand digiwand commented Mar 7, 2025

Description

Scroll does not currently work. Confirmation overflows rather than become scrollable. This PR fixes it by wrapping the content in a flex container.

This PR also readds feature to close the confirmation on drag down or backdrop close.

Related issues

Fixes: #13267 (ScrollView)
Fixes: #13924 (Readd drag down or backdrop click to close)

Manual testing steps

  1. Go to test-dapp
  2. Trigger Malicious Permit signature or another redesign signature with significant content
  3. Observe scroll

Screenshots/Recordings

Before

After

CleanShot.2025-01-30.at.02.18.53.mp4

Pre-merge author checklist

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.

@digiwand digiwand requested a review from a team as a code owner March 7, 2025 06:57
Copy link
Contributor

github-actions bot commented Mar 7, 2025

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 the team-confirmations Push issues to confirmations team label Mar 7, 2025
@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 63.83%. Comparing base (d1d22d7) to head (7c39820).
Report is 49 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main   #13913      +/-   ##
==========================================
+ Coverage   63.42%   63.83%   +0.40%     
==========================================
  Files        2093     2135      +42     
  Lines       45277    45619     +342     
  Branches     6234     6298      +64     
==========================================
+ Hits        28717    29120     +403     
+ Misses      14676    14609      -67     
- Partials     1884     1890       +6     

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

🚀 New features to boost your workflow:
  • Test Analytics: Detect flaky tests, report on failures, and find test suite problems.
  • 📦 JS Bundle Analysis: Save yourself from yourself by tracking and limiting bundle sizes in JS merges.

@digiwand digiwand changed the title fix: Confirm ScrollView fix: Confirm ScrollView and readd drag down and backdrop click to close Mar 7, 2025
OGPoyraz pushed a commit that referenced this pull request Mar 7, 2025
…mModal with BottomSheet (#13914)

<!--
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-picks 1/3 BottomSheet fix:
#13268 into 7.42.0

Todo cherry-picks:
2/3: #13783
3/3: #13913

## **Related issues**

Fixes: #13870

## **Manual testing steps**

Open any redesign signature in Android to test related bug fix

## **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: Brian Nguyen <brianacnguyen@gmail.com>
OGPoyraz pushed a commit that referenced this pull request Mar 7, 2025
…ing BottomModal → Botto… (#13926)

## **Description**

Cherry-picks 2/3 BottomSheet fix:
#13783 into release
7.42.0

## **Related issues**

Fixes: #13267

Cherry-pick PRs:
1/3: #13268
2/3: #13783
3/3: #13913

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

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

<!--
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.
@digiwand digiwand added the Run Smoke E2E Triggers smoke e2e on Bitrise label Mar 7, 2025
Copy link
Contributor

github-actions bot commented Mar 7, 2025

https://bitrise.io/ Bitrise

❌❌❌ pr_smoke_e2e_pipeline failed on Bitrise! ❌❌❌

Commit hash: d7eae6d
Build link: https://app.bitrise.io/app/be69d4368ee7e86d/pipelines/052c09d9-39f2-48b0-b009-44402a86ea70

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

Tip

  • Check the documentation if you have any doubts on how to understand the failure on bitrise

Copy link

sonarqubecloud bot commented Mar 7, 2025

@digiwand digiwand added this pull request to the merge queue Mar 7, 2025
Merged via the queue into main with commit 198a264 Mar 7, 2025
43 of 45 checks passed
@digiwand digiwand deleted the fix-confirm-scroll-and-styles branch March 7, 2025 17:56
@github-actions github-actions bot locked and limited conversation to collaborators Mar 7, 2025
@metamaskbot metamaskbot added the release-7.43.0 Issue or pull request that will be included in release 7.43.0 label Mar 7, 2025
@digiwand digiwand added the release-7.42.0 Issue or pull request that will be included in release 7.42.0 label Mar 7, 2025
@digiwand digiwand changed the title fix: Confirm ScrollView and readd drag down and backdrop click to close fix: cp-7.42.0 Confirm ScrollView and readd drag down and backdrop click to close Mar 7, 2025
OGPoyraz pushed a commit that referenced this pull request Mar 7, 2025
…d backdrop click (#13927)

<!--
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-picks 3/3 BottomSheet fix
#13913 into 7.42.0

## **Related issues**

Fixes: #13870

Cherry-pick PRs:
1/3: #13914 (BottomModal
→ BottomSheet)
2/3: #13926 (bitrise
failure testID)
3/3: #13927 (scroll and
close on swipe down & backdrop click)

## **Manual testing steps**

Test redesign confirmation page behavior

## **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.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
release-7.42.0 Issue or pull request that will be included in release 7.42.0 release-7.43.0 Issue or pull request that will be included in release 7.43.0 Run Smoke E2E Triggers smoke e2e on Bitrise team-confirmations Push issues to confirmations team
Projects
None yet
4 participants