chore: Stable sync release 7.71.0#27813
Merged
Merged
Conversation
…cking cp-7.70.0 (#27455) - feat: MUSD-454 add quick convert event tracking (#27305) <!-- 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: - Adds Segment event tracking for the mUSD Quick Convert flow - Enriches generic `Transaction*` events for `musdConversion` transactions - Adds `confirmation_source` to differentiate between the "Max" convert bottom sheet and custom amount confirmations - Adds `is_max` which is `true` when "Max" conversion flow is used or when custom amount is used and user clicks "Max" button in percentage button row - Adds mUSD quote tracking data ### Events | Event | Type | Location | Description | |---|---|---|---| | `mUSD Quick Convert Screen Viewed` | New standalone event | `MusdQuickConvertView` (on mount) | Fires when the quick convert token list screen is viewed | | `mUSD Bonus Terms of Use Pressed` | New standalone event | `MusdQuickConvertView` (`quick_convert_home_screen`), `EarnMusdConversionEducationView` (`conversion_education_screen`), `useMusdConversionNavbar` (`custom_amount_navbar`), `PercentageRow` (`percentage_row`) | Fires when user presses the bonus terms of use link; `location` property differentiates the source | | `mUSD Quick Convert Token Row Button Clicked` | New standalone event | `MusdQuickConvertView` | Fires on "Max" or "Edit" button tap; includes `button_action`, `redirects_to`, asset details | | `confirmation_source` | New property on `Transaction*` events | `useMusdConversionConfirmationMetrics` | `'quick_convert_max_bottom_sheet_confirmation_screen'` or `'custom_amount_screen'` — only attached to `musdConversion` transactions | | `is_max` | New property on `Transaction*` events | `useMusdConversionConfirmationMetrics` | Derived from `TransactionPayController.isMaxAmount` — only attached to `musdConversion` transactions | | Quote tracking data | New properties on `Transaction*` events | `useMusdConversionConfirmationMetrics` | Standardized quote/pay data via `getMusdConversionQuoteTrackingData` — only attached to `musdConversion` transactions | <!-- 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: Added Segment event tracking for mUSD Quick Convert flow and enrich generic Transaction* events for mUSD conversion transactions ## **Related issues** Fixes: [MUSD-454: Add segment events for Quick Convert flow](https://consensyssoftware.atlassian.net/browse/MUSD-454) ## **Manual testing steps** ```gherkin Feature: mUSD Quick Convert Segment event tracking Scenario: user views the quick convert screen Given user navigates to the mUSD Quick Convert screen When the screen mounts Then "mUSD Quick Convert Screen Viewed" event fires with location "quick_convert_home_screen" Scenario: user taps Max on a token row Given user is on the mUSD Quick Convert screen with convertible tokens When user taps "Max" on a token row Then "mUSD Quick Convert Token Row Button Clicked" event fires with button_action "max" and redirects_to "quick_convert_max_bottom_sheet_confirmation_screen" Scenario: user taps Edit on a token row Given user is on the mUSD Quick Convert screen with convertible tokens When user taps the edit icon on a token row Then "mUSD Quick Convert Token Row Button Clicked" event fires with button_action "custom" and redirects_to "custom_amount_screen" Scenario: user taps "Terms apply" link on the quick convert screen Given user is on a screen displaying the mUSD bonus "Terms apply" link When user taps "Terms apply" Then "mUSD Bonus Terms of Use Pressed" event fires with the location of the current screen Scenario: user confirms a max mUSD conversion Given user is on the max convert bottom sheet confirmation When user taps "Convert" Then "Transaction Approved" event includes confirmation_source "quick_convert_max_bottom_sheet_confirmation_screen", "is_max: true", and quote tracking data Scenario: user confirms a custom amount mUSD conversion Given user is on the custom amount conversion screen When user taps "Convert" Then "Transaction Approved" event includes confirmation_source "custom_amount_screen", "is_max: false" ``` ## **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** - [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] > **Medium Risk** > Adds new MetaMetrics events and confirmation-metric dispatches across mUSD conversion/confirmation screens; while behavior is mostly observational, it touches confirmations flow and transaction status tracking and could affect analytics payloads or introduce unintended side effects if hooks fire unexpectedly. > > **Overview** > Adds **MetaMetrics tracking for the mUSD Quick Convert flow**, including `MUSD_QUICK_CONVERT_SCREEN_VIEWED`, `MUSD_QUICK_CONVERT_TOKEN_ROW_BUTTON_CLICKED` (Max/Edit), and `MUSD_BONUS_TERMS_OF_USE_PRESSED` with location/context properties. > > Introduces a shared analytics utility (`getMusdConversionQuoteTrackingData` + `deepSnakeCaseKeys`) and refactors `useMusdConversionStatus` to use it when emitting `MUSD_CONVERSION_STATUS_UPDATED`, standardizing quote-derived properties. > > Enriches **confirmation metrics for `musdConversion`** by adding a new `useMusdConversionConfirmationMetrics` hook (wired into `MusdConversionInfoRoot`) that dispatches `confirmation_source`, `is_max`, and select quote fields into `confirmationMetrics`. Tests are updated/added accordingly, and `EVENT_LOCATIONS`/`MetaMetricsEvents` are extended to support the new instrumentation. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 6e2e686. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [15edc39](15edc39) Co-authored-by: Matthew Grainger <46547583+Matt561@users.noreply.github.com>
Resolved conflicts between stable (7.69.0) and release/7.70.0: Build/version: take release/7.70.0 versions (7.70.0, build 4020) - android/app/build.gradle, ios project, bitrise.yml Dependencies: take release/7.70.0 versions - package.json, yarn.lock Source code: take release/7.70.0 (newer features and fixes) - Bridge, Perps, Predict, TokenList, confirmations, HyperLiquidProvider - All locale files (de, el, es, fr, hi, id, ja, ko, pt, ru, tl, tr, vi, zh) Merge with "Create a merge commit" — do NOT squash. Made-with: Cursor
The provider code comes from stable (7.69.0) but the test was taken from release/7.70.0 during conflict resolution, causing mock mismatches. Take stable's test to match the provider. Made-with: Cursor
The test must match release/7.70.0's provider, not stable's. Reverting to release/7.70.0's test so merging this PR doesn't break the release branch. Made-with: Cursor
## **Description**
Sync stable branch into release/7.70.0 to include hotfix releases
(7.68.1, 7.68.2) that were merged to stable.
## **Changelog**
CHANGELOG entry: null
## **Related issues**
Fixes:
## **Manual testing steps**
```gherkin
Feature: Stable sync
Scenario: release branch includes latest stable changes
Given the release/7.70.0 branch exists
When stable is synced into release/7.70.0
Then the release branch includes all hotfix changes from stable
```
## **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.
Made with [Cursor](https://cursor.com)
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> **Low Risk**
> Documentation-only change updating `CHANGELOG.md`; no runtime code
paths are affected.
>
> **Overview**
> **Updates release documentation** by adding a new `7.69.0` section to
`CHANGELOG.md` with consolidated Added/Changed/Fixed entries.
>
> Also adds `7.68.1` and `7.68.2` sections and updates the bottom
compare links so `[Unreleased]` now compares from `v7.69.0` and includes
new version link references.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
a0eca7f. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
Made-with: Cursor
…ore tab icon cp-7.69.1 cp-7.70.0 (#27489) - refactor: Reverted selected state for explore tab icon cp-7.69.1 cp-7.70.0 (#27459) <!-- 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** Updates the Explore (Trending) tab icon in the main tab bar from the filled variant to the outline variant. ## **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: Updated Explore tab icon in the main tab bar to use the outline style. ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/DSYS-578 ## **Manual testing steps** ```gherkin Feature: Explore tab icon in tab bar Scenario: Explore tab shows outline search icon Given the app is open and the user is on any main tab When the user views the tab bar Then the Explore (Trending) tab shows the outline search icon (not the filled variant) And the icon is visible and correctly aligned with other tab icons ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> ### **After** https://github.com/user-attachments/assets/e9d96e13-1420-4db6-8353-3de9fd0b06a9 <!-- [screenshots/recordings] --> ## **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] > **Low Risk** > Low risk visual-only change that swaps the selected-state icon for the Explore/Trending tab; no navigation, analytics, or data flows are affected. > > **Overview** > Updates the TabBar selected-state icon mapping for the Explore/Trending tab to use the outline `IconName.Search` instead of the filled `IconName.SearchFilled`, reverting its “active” appearance to match the outline style. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 829d018. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [2d1ed07](2d1ed07) Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com>
…r with safeareaview cp-7.69.1 cp-7.70.0 (#27491) - fix: Updated root pages scrollable behavior with safeareaview cp-7.69.1 cp-7.70.0 (#27446) <!-- 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** Standardizes safe area and header inset behavior across the main tab views (Wallet, Explore, Activity, Rewards). 1. **Reason for the change:** These views used `edges={{ bottom: 'additive' }}` on `SafeAreaView` and `includesTopInset` on headers, which was inconsistent with the desired layout and could cause double insets or incorrect safe area handling. 2. **Improvement:** Switched to `edges={{ top: 'additive' }}` on `SafeAreaView` and removed `includesTopInset` from header components so the top safe area is handled by the screen container and headers align consistently. ## **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: #27443 ## **Manual testing steps** ```gherkin Feature: Safe area and header insets on main tabs Scenario: Wallet, Explore, Activity, and Rewards use consistent safe area Given the app is open on a device or simulator with a notch/safe area When the user switches to each main tab (Wallet, Explore, Activity, Rewards) Then the top safe area is applied by the screen (no double inset) And the header (title + accessories) aligns correctly below the safe area And the bottom of each view respects the tab bar / device safe area as before ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** https://github.com/user-attachments/assets/0eda5978-7bd5-4428-86ea-f62637fb06ed <!-- [screenshots/recordings] --> ### **After** https://github.com/user-attachments/assets/a8ff8e19-a49e-41f4-9056-7c2271da8c66 <!-- [screenshots/recordings] --> ## **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] > **Medium Risk** > Layout-only changes to core tab screens (Wallet/Explore/Activity/Rewards) that can affect safe-area padding and scroll behavior across devices, plus removal of Wallet’s bottom fade/scroll tracking logic which could subtly change UX on the homepage. > > **Overview** > Standardizes safe-area handling across the main tab views by switching root `SafeAreaView` usage from `edges={{ bottom: 'additive' }}` to `edges={{ top: 'additive' }}` and removing header `includesTopInset` so the top inset is applied consistently by the screen container. > > In `Wallet`, removes the bottom fade `LinearGradient` overlay and its associated scroll/size tracking state, simplifying scroll handling to just notify homepage section subscribers via `handleHomepageScroll`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit c4b0e41. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [3c1ee48](3c1ee48) Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.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**
Increase JS bundle 1 MB
<!--
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:
## **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]
> **Low Risk**
> Low risk: workflow-only change that just relaxes the CI bundle-size
gate by 1 unit and doesn’t affect runtime code.
>
> **Overview**
> **CI bundle-size gating has been relaxed slightly.** The
`js-bundle-size-check` step in `.github/workflows/ci.yml` now allows an
iOS `main.jsbundle` size threshold of `53` instead of `52` when running
`./scripts/js-bundle-stats.sh`.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
3c0f0a4. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
<!--
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**
OTA was broken with old environment variables check. This PR aims to
solve that by introdocing a new environment variable.
<!--
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:
## **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]
> **Medium Risk**
> Changes how several services choose API endpoints/environments by
switching from `GITHUB_ACTIONS`/`E2E` checks to a new
`BUILDS_ENABLED_WITH_GH_ACTIONS_TEMPORARY` flag, which could route
builds to different backend environments if misconfigured.
>
> **Overview**
> Introduces a new build-time env flag,
`BUILDS_ENABLED_WITH_GH_ACTIONS_TEMPORARY`, and uses it to decide when
to take **build-provided** URLs/environments (from `builds.yml`) versus
deriving them from `METAMASK_ENVIRONMENT`.
>
> Updates Baanx Card URL mapping, ramps SDK environment selection
(Aggregator + Deposit), ramps controller init, and rewards API URL
override logic to key off this flag, and refreshes/adjusts tests
accordingly (including removing the previous special-casing tied to
`E2E`).
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
4249918. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
The encryptorAdapter introduced in PR #26258 overrides encryptWithKey to return browser-passworder format ({ data }) instead of the mobile Encryptor format ({ cipher }). However, decrypt and decryptWithDetail were not overridden — they were spread from the mobile Encryptor, which reads the cipher field. This caused a crash on the next unlock after any background JWT token refresh: TypeError: The first argument must be one of type string, Buffer... Received type undefined (quick-crypto.ts:101) Fix: add normalizeVaultFormat which injects cipher = data when a vault has data but no cipher, and override decrypt and decryptWithDetail in the adapter to normalize before delegating to the underlying Encryptor. Also harden decryptWithKey to accept both data and cipher fields (for pre-adapter vaults that only carry cipher), and throw explicitly when both fields are absent. Adds end-to-end tests that reproduce the bug scenario: background token refresh writes a data-format vault via encryptWithKey, then decrypt / decryptWithDetail must recover it on the next unlock.
…r with safeareaview (#27502) - fix: Updated root pages scrollable behavior with safeareaview cp-7.69.1 cp-7.70.0 (#27446) <!-- 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** Standardizes safe area and header inset behavior across the main tab views (Wallet, Explore, Activity, Rewards). 1. **Reason for the change:** These views used `edges={{ bottom: 'additive' }}` on `SafeAreaView` and `includesTopInset` on headers, which was inconsistent with the desired layout and could cause double insets or incorrect safe area handling. 2. **Improvement:** Switched to `edges={{ top: 'additive' }}` on `SafeAreaView` and removed `includesTopInset` from header components so the top safe area is handled by the screen container and headers align consistently. ## **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: #27443 ## **Manual testing steps** ```gherkin Feature: Safe area and header insets on main tabs Scenario: Wallet, Explore, Activity, and Rewards use consistent safe area Given the app is open on a device or simulator with a notch/safe area When the user switches to each main tab (Wallet, Explore, Activity, Rewards) Then the top safe area is applied by the screen (no double inset) And the header (title + accessories) aligns correctly below the safe area And the bottom of each view respects the tab bar / device safe area as before ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** https://github.com/user-attachments/assets/0eda5978-7bd5-4428-86ea-f62637fb06ed <!-- [screenshots/recordings] --> ### **After** https://github.com/user-attachments/assets/a8ff8e19-a49e-41f4-9056-7c2271da8c66 <!-- [screenshots/recordings] --> ## **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] > **Medium Risk** > Layout-only changes to core tab screens (Wallet/Explore/Activity/Rewards) that can affect safe-area padding and scroll behavior across devices, plus removal of Wallet’s bottom fade/scroll tracking logic which could subtly change UX on the homepage. > > **Overview** > Standardizes safe-area handling across the main tab views by switching root `SafeAreaView` usage from `edges={{ bottom: 'additive' }}` to `edges={{ top: 'additive' }}` and removing header `includesTopInset` so the top inset is applied consistently by the screen container. > > In `Wallet`, removes the bottom fade `LinearGradient` overlay and its associated scroll/size tracking state, simplifying scroll handling to just notify homepage section subscribers via `handleHomepageScroll`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit c4b0e41. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [3c1ee48](3c1ee48) Co-authored-by: Brian August Nguyen <brianacnguyen@gmail.com> Co-authored-by: João Loureiro <175489935+joaoloureirop@users.noreply.github.com>
This reverts commit 5cd8c23.
Resolved conflicts between stable (7.69.0) and release/7.68.3: Build/version: take release/7.68.3 versions - app/constants/ota.ts: keep v7.68.3 Source code: take release/7.68.3 (hotfix-specific changes) - remote-feature-flag-build-time-defaults-config.ts: keep (deleted on stable) - featureFlagController selectors: keep release/7.68.3 versions Merge with "Create a merge commit" — do NOT squash. Made-with: Cursor
…70.0 (#27498) - chore: Market Insights design review cp-7.70.0 (#27259) <!-- 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** Updates a few design elements In Market Insights. ## **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] > **Medium Risk** > Adds new Buy navigation and CAIP-asset parsing from Market Insights, plus a `react-native-video` background; these touch navigation/asset-id construction and could break CTAs or tests if ramp/swap inputs are wrong. > > **Overview** > Updates the Market Insights full-screen view to include an auto-playing light/dark background video and replaces the single Trade CTA with side-by-side **Swap** and **Buy** buttons. Swap interaction tracking is renamed from `trade` to `swap`, and a new `buy` interaction event is tracked; Buy routes through ramp navigation with best-effort `assetId` derivation from the token address/chain. > > Polishes several Market Insights components/styles (entry card header/disclaimer layout, icon sizing, feedback copy/typography, bottom sheet source list spacing) and tweaks behavior so tapping a source closes the trend sources sheet. Tests and Jest config are updated accordingly, including new mocks for `.mp4` assets and `react-native-video`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit d1e6ce2. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [dab238f](dab238f) Co-authored-by: António Regadas <antonio.regadas@consensys.net>
…allet token list cp-7.69.1 cp-7.70.0 (#27503) - chore: correct token price formatting in wallet token list cp-7.69.1 cp-7.70.0 (#27485) <!-- 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** Two visual bugs were affecting the token price display in the wallet token list (`TokenListItemV2`) and the explore/trending page. **Bug 1 — Missing thousand-separator commas** The token price in the second row of each list item (e.g. `$2283.65` for ETH) was formatted with `addCurrencySymbol`, which constructs the string via a plain `.toString()` call and never applies locale-aware number formatting. This meant that prices ≥ $1,000 rendered without commas (e.g. `$2283.65` instead of `$2,283.65`). Fixed by switching to `formatPriceWithSubscriptNotation`, the same formatter already used on the asset-overview/price chart page, which uses `Intl.NumberFormat('en-US', …)` and produces properly comma-separated output. **Bug 2 — Too many decimal places for large prices** `formatPriceWithSubscriptNotation` was configured with `maximumFractionDigits: 4` unconditionally, so a price like `$2,285.013` (3 significant decimal digits within the allowed 2–4 range) rendered incorrectly. This also affected the explore/trending token row. Fixed by scoping `maximumFractionDigits` to the magnitude of the price: 2 decimals for values ≥ 1, 4 decimals for values < 1 (where extra precision matters, e.g. `$0.1446`). Subscript notation for very small values is unaffected. **Bug 3 — Unintentional bold weight on fiat balance** The fiat balance text variant was `BodyMDBold` instead of `BodyMDMedium`, making the balance appear heavier than intended. The full description has been saved to `.agent/chore-remove-bold-and-add-commas-list-item-v2.PR-desc.md`. <!-- 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: fixed token prices in the wallet list displaying without thousand-separator commas and with too many decimal places ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-2909 & https://consensyssoftware.atlassian.net/browse/ASSETS-2921 ## **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** <img width="200" alt="image" src="https://github.com/user-attachments/assets/3916037a-33b4-4e7e-8fbe-1dd033256037" /> <img width="200" alt="image" src="https://github.com/user-attachments/assets/84efa704-d986-4e2d-95f2-d277906975df" /> ### **After** Look at the title and the USD amount. As you can see it is not bold anymore: <img width="200" alt="image" src="https://github.com/user-attachments/assets/3a267238-9137-4849-9961-fc1af621b384" /> Look at the decimals in Ethereum on Mainnet: <img width="200" alt="image" src="https://github.com/user-attachments/assets/c4275147-836d-4446-9ce4-f2b9b46b31ef" /> <!-- [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] > **Medium Risk** > Adjusts a shared price formatter and switches wallet token list rendering to it, which could change how fiat prices appear across multiple screens. Risk is limited to display/formatting (no transaction or balance calculations). > > **Overview** > Fixes token price display in the wallet token list by replacing `addCurrencySymbol` with `formatPriceWithSubscriptNotation`, restoring locale-aware formatting (e.g., thousand separators) and consistent currency symbol/suffix handling. > > Updates `formatPriceWithSubscriptNotation` to **cap decimals at 2 for values >= 1** while keeping up to 4 decimals (and subscript notation) for smaller values, and adds unit tests to cover the new truncation behavior. Also tweaks the fiat balance text style in `TokenListItemV2` from bold to a medium weight. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 18f74fe. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [af384ae](af384ae) Co-authored-by: Juanmi <95381763+juanmigdr@users.noreply.github.com>
…Action cp-7.70.0 (#27497) - chore: New Crowdin translations by Github Action cp-7.70.0 (#27390) Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com> [0050742](0050742) Co-authored-by: MetaMask Bot <37885440+metamaskbot@users.noreply.github.com> Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com>
## Description Sync stable branch into release/7.70.0 to include changes from 7.69.1 and avoid conflicts when merging release PR #27451. ## Changelog CHANGELOG entry: null ## Conflict resolution Resolved conflicts: - `app/constants/ota.ts`: keep v7.65.1 (release version — 7.70.0 is main release, OTA_VERSION managed separately) - `CHANGELOG.md`: take stable's 7.69.1 compare links - `TokenListItemV2.tsx`: keep release version (hideFiatForScamWarning, Merkl features) Made with Cursor Made with [Cursor](https://cursor.com) <!-- CURSOR_SUMMARY --> --- > [!NOTE] > **Low Risk** > Documentation-only change updating `CHANGELOG.md`; no runtime or build logic is modified, so risk is minimal. > > **Overview** > Adds a new `7.69.1` section to `CHANGELOG.md` with two fixes, and updates the bottom compare links so `[Unreleased]` now compares from `v7.69.1` and includes a new `[7.69.1]` link. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit e986cf5. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
…onus font weight and tooltip color cp-7.70.0 (#27698) - feat: fix incorrect styling of claimable bonus font weight and tooltip color cp-7.70.0 (#27666) <!-- 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** Fixes some incorrect styling for the "Claimable bonus" row. ### Changes: - `"Claimable Bonus"` font weight updated to match other rows - `"Claimable Bonus"` tooltip color changed to `Alternative` - Centered Quick Convert bottom sheet error messages - `"Rate"` row text font weight updated to match other rows <!-- 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: fix percentage-row inconsistent styling ## **Related issues** Fixes: ## **Manual testing steps** ```gherkin Feature: mUSD conversion confirmation styling Scenario: user views claimable bonus row with correct styling Given user is on the mUSD conversion confirmation screen When user views the "Claimable bonus" info row Then the label font weight matches other small-variant info rows And the tooltip icon color is Alternative, consistent with the transaction fee row Scenario: user views blocking alert message centered Given user triggers ``` ## **Screenshots/Recordings** <!-- If applicable, add screenshots and/or recordings to visualize the before and after of your change. --> ### **Before** <!-- [screenshots/recordings] --> <img width="500" height="477" alt="image" src="https://github.com/user-attachments/assets/11a97285-6b6d-4298-9733-d28e1bc71608" /> <img width="500" height="477" alt="image" src="https://github.com/user-attachments/assets/4b9e8999-66e2-41bf-bd84-3879a1b88727" /> ### **After** <!-- [screenshots/recordings] --> <img width="500" height="477" alt="image" src="https://github.com/user-attachments/assets/287b1b56-2eee-46e1-8e03-c765a21db9d5" /> <img width="500" height="477" alt="image" src="https://github.com/user-attachments/assets/6e6bae89-f971-4f54-932c-722946784b66" /> ## **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] > **Low Risk** > Low risk UI-only styling adjustments to confirmation rows and blocking alert text; no business logic or data flow changes. > > **Overview** > Fixes styling inconsistencies in the mUSD conversion confirmation UI by rendering the "Claimable bonus" and conversion rate rows using the `InfoRowVariant.Small` variant (matching label font weight) and updating the claimable bonus tooltip icon color to `IconColor.Alternative`. > > Also centers blocking alert error text in the quick convert bottom sheet by applying `textAlign: 'center'` to string-based blocking alert messages. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit fe91c3b. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> [e185571](e185571) Co-authored-by: Matthew Grainger <46547583+Matt561@users.noreply.github.com>
This PR updates the change log for 7.70.0. --------- Co-authored-by: metamaskbot <metamaskbot@users.noreply.github.com> Co-authored-by: chloeYue <chloe.gao@consensys.net>
# 🚀 v7.70.0 Testing & Release Quality Process Hi Team, As part of our new **MetaMask Release Quality Process**, here’s a quick overview of the key processes, testing strategies, and milestones to ensure a smooth and high-quality deployment. --- ## 📋 Key Processes ### Testing Strategy - **Developer Teams:** Conduct regression and exploratory testing for your functional areas, including automated and manual tests for critical workflows. - **QA Team:** Focus on exploratory testing across the wallet, prioritize high-impact areas, and triage any Sentry errors found during testing. - **Customer Success Team:** Validate new functionalities and provide feedback to support release monitoring. ### GitHub Signoff - Each team must **sign off on the Release Candidate (RC)** via GitHub by the end of the validation timeline (**Tuesday EOD PT**). - Ensure all tests outlined in the Testing Plan are executed, and any identified issues are addressed. ### Issue Resolution - **Resolve all Release Blockers** (Sev0 and Sev1) by **Tuesday EOD PT**. - For unresolved blockers, PRs may be reverted, or feature flags disabled to maintain release quality and timelines. ### Cherry-Picking Criteria - Only **critical fixes** meeting outlined criteria will be cherry-picked. - Developers must ensure these fixes are thoroughly reviewed, tested, and merged by **Tuesday EOD PT**. --- ## 🗓️ Timeline and Milestones 1. **Today (Friday):** Begin Release Candidate validation. 2. **Tuesday EOD PT:** Finalize RC with all fixes and cherry-picks. 3. **Wednesday:** Buffer day for final checks. 4. **Thursday:** Submit release to app stores and begin rollout to 1% of users. 5. **Monday:** Scale deployment to 10%. 6. **Tuesday:** Full rollout to 100%. --- ## ✅ Signoff Checklist Each team is responsible for signing off via GitHub. Use the checkbox below to track signoff completion: # Team sign-off checklist - [x] Accounts Framework - [x] Assets - [x] Bots Team - [x] Card - [x] Confirmations - [x] Core Extension UX - [x] Core Platform - [x] Design System - [x] Earn - [x] Engagement - [x] Mobile Platform - [x] Mobile UX - [x] Networks - [x] Onboarding - [x] Perps - [x] Predict - [x] Ramp - [x] Rewards - [x] Social & AI - [x] Swaps and Bridge - [x] team-ramps - [x] Wallet Integrations This process is a major step forward in ensuring release stability and quality. Let’s stay aligned and make this release a success! 🚀 Feel free to reach out if you have questions or need clarification. Many thanks in advance # Reference - Testing plan sheet - https://docs.google.com/spreadsheets/d/1tsoodlAlyvEUpkkcNcbZ4PM9HuC9cEM80RZeoVv5OCQ/edit?gid=404070372#gid=404070372
Resolved conflicts between stable (7.70.0) and release/7.71.0: Build/version: take release/7.71.0 (7.71.0, build 4148) - android/app/build.gradle, ios project, bitrise.yml Dependencies: take release/7.71.0 versions - package.json, yarn.lock Source: take release/7.71.0 (newer release work) - MarketInsightsView, testIds, mUSD events, MusdAggregatedRow tests, mp4Mock CHANGELOG, AndroidManifest, remote flag defaults, and selector updates from stable. Merge with "Create a merge commit" — do NOT squash. Made-with: Cursor
Contributor
|
CLA Signature Action: All authors have signed the CLA. You may need to manually re-run the blocking PR check if it doesn't pass in a few minutes. |
metamaskbot
added
team-qa
github-actions
Bot
added
size-M
risk-low
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 2 potential issues.
Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.
chloeYue
added
skip-sonar-cloud
github-actions
Bot
added
risk-high
Contributor
🔍 Smart E2E Test Selection⏭️ Smart E2E selection skipped - skip-smart-e2e-selection label found All E2E tests pre-selected. |
Contributor
|
✅ E2E Fixture Validation — Schema is up to date |
|
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.
8 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.
Description
Sync
stableintorelease/7.71.0so the release branch includes everything merged to stable through 7.70.0 (e.g. hotfixes and changelog), matching the pattern from #27468.Changelog
CHANGELOG entry: null
Made with Cursor
Note
Medium Risk
Medium risk because it alters Android permission declarations (Bluetooth/location) and changes feature-flag override precedence in certain build environments, which could affect runtime behavior or Play Store compliance if misconfigured.
Overview
Updates
CHANGELOG.mdwith release notes for7.70.0, adds7.69.1/7.68.3, and updates the compare links for the new tags.Adjusts Android Bluetooth-related permissions in
AndroidManifest.xmlby removing the API 30 maxSdk constraint onACCESS_FINE_LOCATIONand dropping theneverForLocationflag fromBLUETOOTH_SCAN.Changes feature-flag selectors so that when
BUILDS_ENABLED_WITH_GH_ACTIONS_TEMPORARY=true(and notE2E), remote flags take precedence and local env overrides are ignored forextensionUxPna25andadditionalNetworksBlacklist, plus adds a smallbuildTimeDefaultsConfighelper for this gating.Written by Cursor Bugbot for commit 63cee1a. This will update automatically on new commits. Configure here.