[pull] main from MetaMask:main#300
Merged
Merged
Conversation
<!--
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**
- Changes resolver link
- Position's title on home screen are full now
- Change the positions on market details
<!--
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?
-->
## **Changelog**
<!--
If this PR is not End-User-Facing and should not show up in the
CHANGELOG, you can choose to either:
1. Write `CHANGELOG entry: null`
2. Label with `no-changelog`
If this PR is End-User-Facing, please write a short User-Facing
description in the past tense like:
`CHANGELOG entry: Added a new tab for users to see their NFTs`
`CHANGELOG entry: Fixed a bug that was causing some NFTs to flicker`
(This helps the Release Engineer do their job more quickly and
accurately)
-->
CHANGELOG entry: null
## **Related issues**
Fixes:
## **Manual testing steps**
```gherkin
Feature: my feature name
Scenario: user [verb for user action]
Given [describe expected initial app state]
When user [verb for user action]
Then [describe expected outcome]
```
## **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.
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> Revamps Predict UI: adds “Resolution details” with Polymarket link,
shows full/grouped position titles with new layout, reorders outcomes,
removes fee info icons, and makes amount cursor height dynamic.
>
> - **Predict Market Details**:
> - Replace resolver/provider sections with **“`resolution_details`”**
and link to Polymarket docs; remove powered-by/resolver address.
> - Minor header/status spacing tweaks.
> - In partially resolved markets, list open outcomes above the
expandable resolved outcomes.
> - **Positions UI**:
> - `PredictPositionDetail`: show `groupItemTitle` (fallback to
`title`); subtitle now `${initial} on {outcome} • {avgPrice}¢`;
image/layout refinements.
> - `PredictPosition`: show full `title` (no truncation); new image
container; minor style tweaks.
> - **Amount Display**:
> - `PredictAmountDisplay`: make active cursor height dynamic based on
line height; slight margin tweak.
> - **Fee Summary**:
> - `PredictFeeSummary`: remove info icons from fee rows.
> - **i18n**:
> - Add `predict.market_details.resolution_details` string.
> - **Tests**:
> - Update expectations for new texts, layout, and outcome ordering
across affected components.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
7ce52b7. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
Adding documentation about how to hook into the deep / universal links functionality <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Adds a new, detailed deeplink handling guide with visual flowcharts and removes the legacy deeplinks doc. > > - **Docs**: > - **New Guides**: > - `docs/readme/deeplinking.md`: Comprehensive MetaMask Mobile deeplink guide covering link types, processing pipeline, action routing, signed link verification with `sig_params`, handler integration steps, testing, and security. > - `docs/readme/deeplinking-graphs.md`: Visual Mermaid flowcharts for full processing flow, signature creation/verification, dynamic parameters, and common scenarios. > - **Removed**: > - `docs/readme/deeplinks.md` (legacy, brief guide). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 8b6a530. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
## **Description** Bug was reported where dismissing the close all positions/orders bottom sheet was dismissing the bottom sheet, but the overlay would persist. This made the PerpsHomeScreenView non-interactive and blocked users. This PR introduces a fix where we properly dismiss the bottom sheet both via close icon press, as well as externally by pressing the overlay outside of the sheet. ## **Changelog** CHANGELOG entry: Fix to close all positions/orders bottom sheet ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/TAT-2021 ## **Manual testing steps** ```gherkin Feature: Close All and Cancel All bottom sheet overlay dismissal Scenario: user dismisses Close All bottom sheet by pressing overlay Given user is on PerpsHomeScreen with open positions And Close All bottom sheet is displayed with overlay When user presses outside the bottom sheet on the overlay Then the bottom sheet dismisses with animation And the overlay is removed And PerpsHomeScreen becomes interactive Scenario: user dismisses Close All bottom sheet by pressing Keep Positions Given user is on PerpsHomeScreen with open positions And Close All bottom sheet is displayed with overlay When user presses "Keep Positions" button Then the bottom sheet dismisses with animation And the overlay is removed And PerpsHomeScreen becomes interactive Scenario: user dismisses Cancel All bottom sheet by pressing overlay Given user is on PerpsHomeScreen with open orders And Cancel All bottom sheet is displayed with overlay When user presses outside the bottom sheet on the overlay Then the bottom sheet dismisses with animation And the overlay is removed And PerpsHomeScreen becomes interactive Scenario: user dismisses Cancel All bottom sheet by pressing Keep Orders Given user is on PerpsHomeScreen with open orders And Cancel All bottom sheet is displayed with overlay When user presses "Keep Orders" button Then the bottom sheet dismisses with animation And the overlay is removed And PerpsHomeScreen becomes interactive ``` ## **Screenshots/Recordings** https://github.com/user-attachments/assets/381fcd6c-acd7-4f71-aa29-a4fb2f27450d ## **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. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Properly closes the bottom sheet and removes the overlay when dismissed via overlay tap, close icon, or "Keep" buttons for Close All Positions and Cancel All Orders. > > - **Perps**: > - **`PerpsCancelAllOrdersView`**: > - Add `handleKeepButtonPress` to correctly close when used as overlay; wire to footer `keep_orders` button. > - Pass `onClose` to `BottomSheet` when `externalSheetRef` is provided; update all instances (empty/content states). > - **`PerpsCloseAllPositionsView`**: > - Add `handleKeepButtonPress` to correctly close when used as overlay; wire to footer `keep_positions` button. > - Pass `onClose` to `BottomSheet` when `externalSheetRef` is provided; update all instances (loading/empty/content states). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 232ec94. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com>
This PR syncs the stable branch to main for version 7.59.0. *Synchronization Process:* - Fetches the latest changes from the remote repository - Resets the branch to match the stable branch - Attempts to merge changes from main into the branch - Handles merge conflicts if they occur *File Preservation:* Preserves specific files from the stable branch: - CHANGELOG.md - bitrise.yml - android/app/build.gradle - ios/MetaMask.xcodeproj/project.pbxproj - package.json Indicates the next version candidate of main to 7.59.0 <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Updates CHANGELOG with new 7.58.0 and 7.57.2 release notes and compare links; no functional code changes. > > - **Release notes**: > - Add detailed `7.58.0` and `7.57.2` sections in `CHANGELOG.md` (Added/Changed/Fixed). > - Fix bullet formatting in prior entries and update compare links (`[Unreleased]`, `[7.58.0]`, `[7.57.2]`). > - **Android**: > - Preserve `android/app/build.gradle` (no functional changes). > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit afe7d22. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Wei Sun <wei.sun@consensys.net> Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com> Co-authored-by: Nicholas Smith <nick.smith@consensys.net> Co-authored-by: Matthew Grainger <matthew.grainger@consensys.net> Co-authored-by: Bryan Fullam <bryan.fullam@consensys.net> Co-authored-by: Matthew Grainger <46547583+Matt561@users.noreply.github.com> Co-authored-by: infiniteflower <139582705+infiniteflower@users.noreply.github.com> Co-authored-by: ieow <4881057+ieow@users.noreply.github.com> Co-authored-by: Gaurav Goel <grvgoel19@gmail.com> Co-authored-by: himanshuchawla009 <himanshuchawla2014@gmail.com> Co-authored-by: sethkfman <10342624+sethkfman@users.noreply.github.com> Co-authored-by: abretonc7s <107169956+abretonc7s@users.noreply.github.com> Co-authored-by: Nicholas Gambino <nicholas.gambino@consensys.net> Co-authored-by: Arthur Breton <arthur.breton@consensys.net> Co-authored-by: Nick Gambino <35090461+gambinish@users.noreply.github.com> Co-authored-by: SteP-n-s <stylianos.panagakos@consensys.net> Co-authored-by: Nico MASSART <NicolasMassart@users.noreply.github.com> Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com> Co-authored-by: dylanbutler1 <99672693+dylanbutler1@users.noreply.github.com> Co-authored-by: tommasini <46944231+tommasini@users.noreply.github.com> Co-authored-by: Vince Howard <vincenguyenhoward@gmail.com> Co-authored-by: Juanmi <95381763+juanmigdr@users.noreply.github.com> Co-authored-by: Matthew Walsh <matthew.walsh@consensys.net> Co-authored-by: Ganesh Suresh Patra <ganesh.patra@consensys.net> Co-authored-by: Jyoti Puri <jyotipuri@gmail.com> Co-authored-by: sethkfman <Seth.Kaufman@consensys.net> Co-authored-by: OGPoyraz <omergoktugpoyraz@gmail.com> Co-authored-by: Prithpal Sooriya <prithpal.sooriya@consensys.net> Co-authored-by: Salim TOUBAL <salim.toubal@outlook.com> Co-authored-by: Cal Leung <cal.leung@consensys.net> Co-authored-by: Pedro Pablo Aste Kompen <wachunei@gmail.com> Co-authored-by: Satyajeet Kolhapure <77279246+satyajeetkolhapure@users.noreply.github.com> Co-authored-by: Jean-Baptiste Blanc <jb.blanc@consensys.net> Co-authored-by: George Weiler <georgejweiler@gmail.com> Co-authored-by: Caainã Jeronimo <caainaje@gmail.com> Co-authored-by: Luis Taniça <matallui@gmail.com> Co-authored-by: VGR <VanGulckRik@gmail.com> Co-authored-by: George Marshall <george.marshall@consensys.net> Co-authored-by: AxelGes <34173844+AxelGes@users.noreply.github.com> Co-authored-by: Patryk Łucka <patryk.lucka@gmail.com> Co-authored-by: Gustavo Antunes <17601467+gantunesr@users.noreply.github.com> Co-authored-by: Davide Brocchetto <davide.brocchetto@consensys.net> Co-authored-by: Curtis David <Curtis.David7@gmail.com> Co-authored-by: Monte Lai <monte.lai@consensys.net> Co-authored-by: Bruno Nascimento <brunonascimentodev@gmail.com> Co-authored-by: Maarten Zuidhoorn <maarten@zuidhoorn.com> Co-authored-by: cmd-ob <ola.bale@consensys.net> Co-authored-by: João <castrofjoao@gmail.com> Co-authored-by: sophieqgu <sophieqgu@gmail.com> Co-authored-by: Alejandro Garcia Anglada <aganglada@gmail.com> Co-authored-by: Mathieu Artu <mathieu.artu@consensys.net> Co-authored-by: sophieqgu <37032128+sophieqgu@users.noreply.github.com> Co-authored-by: Charly Chevalier <charlyy.chevalier@gmail.com> Co-authored-by: Bryan Fullam <8902170+bfullam@users.noreply.github.com> Co-authored-by: António Regadas <antonio.regadas@consensys.net> Co-authored-by: Edouard Bougon <15703023+EdouardBougon@users.noreply.github.com> Co-authored-by: Alex Donesky <adonesky@gmail.com> Co-authored-by: Baptiste Marchand <75846779+baptiste-marchand@users.noreply.github.com> Co-authored-by: Fabio Bozzo <fabio.bozzo@gmail.com> Co-authored-by: Owen Craston <owen.craston@consensys.net> Co-authored-by: Pavel Dvorkin <pavel.dvorkin@consensys.net> Co-authored-by: Kevin Bluer <kevin@bluer.com> Co-authored-by: Nodonisko <suchydan@gmail.com> Co-authored-by: Tamas <soostamas.hu@gmail.com> Co-authored-by: ffmcgee <51971598+ffmcgee725@users.noreply.github.com> Co-authored-by: Alexandre Chappaz <alex@achappaz.fr> Co-authored-by: Harika <153644847+hjetpoluru@users.noreply.github.com> Co-authored-by: Erik Nilsson <eriks@mail.se> Co-authored-by: runway-github[bot] <73448015+runway-github[bot]@users.noreply.github.com> Co-authored-by: Patryk Łucka <5708018+PatrykLucka@users.noreply.github.com> Co-authored-by: Bernardo Garces Chapero <bernardo.chapero@consensys.net> Co-authored-by: Christian Montoya <christian.montoya@consensys.net> Co-authored-by: Vinicius Stevam <45455812+vinistevam@users.noreply.github.com> Co-authored-by: Gauthier Petetin <gauthierpetetin@hotmail.com> Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com> Co-authored-by: Xiaoming Wang <7315988+dawnseeker8@users.noreply.github.com> Co-authored-by: Elliot Winkler <elliot.winkler@gmail.com> Co-authored-by: Frederik Bolding <frederik.bolding@gmail.com> Co-authored-by: Charly Chevalier <charly.chevalier@consensys.net> Co-authored-by: Micaela <100321200+micaelae@users.noreply.github.com> Co-authored-by: salimtb <salim.toubal@consensys.net> Co-authored-by: Micaela Estabillo <micaela.estabillo@consensys.net> Co-authored-by: George Gkasdrogkas <georgegkas@gmail.com> Co-authored-by: rarquevaux <r.arquevaux@gmail.com> Co-authored-by: Aslau Mario-Daniel <marioaslau@gmail.com> Co-authored-by: Bruno Nascimento <bruno.nascimento@consensys.net> Co-authored-by: tommasini <tommasini15@gmail.com> Co-authored-by: jake-perkins <128608287+jake-perkins@users.noreply.github.com> Co-authored-by: Matt <matt.ilagan@consensys.net> Co-authored-by: Laurel <153323700+i18nlaurel@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
See Commits and Changes for more details.
Created by
pull[bot] (v2.0.0-alpha.4)
Can you help keep this open source service alive? 💖 Please sponsor : )