[pull] main from MetaMask:main#363
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** Some bug fixes on Trending plus some improvements: Improvements: - Search results were not the same when searching on omnisearch and when searching on each of the pages separately, I have moved the search to each of the hooks so that search is handled there (also removes the need of getSearchQuery from the sectionsConfig) - Removed the need for a keyExtractor in the sectionsConfig - Homogenized and reworked Skeletons so that the experience as a user is better Bug fixes: - Clicking on a native asset within trending throws error and makes the app restart <!-- 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: trending bug fixes and improvements ## **Related issues** Fixes: https://consensyssoftware.atlassian.net/browse/ASSETS-1837 ## **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] > Moves search filtering into section hooks, standardizes skeleton UIs, and fixes navigation for native tokens from Trending. > > - **Search architecture**: > - Move filtering into hooks: `useTrendingSearch`, `useSitesData(searchQuery, limit)`, `usePerpsSearch`, and sections via `useSectionsData(searchQuery)`; remove per-section `getSearchableText`/key extractors. > - `useTrendingSearch`: filters trending by query, merges with search API, dedupes; exposes loading; tests added. > - `useSearchRequest`: `chainIds` optional; debounced explore search uses section-provided data. > - **Perps**: > - Add `filterMarketsByQuery` in `marketUtils` (+ tests) and use in `usePerpsSearch` and sections. > - **Sites**: > - `useSitesData` now returns all sites and filters locally by `searchQuery`; API fetch unchanged; tests updated. > - `SitesFullView` passes `searchQuery` to hook; removes local filtering. > - **Trending tokens**: > - `TrendingTokenRowItem`: refactor badge/source helpers; add native-token nav support (`isNative`/`isETH`) and memoization; color helper for pct change; tests for ETH/MATIC/native cases. > - `TrendingTokensFullView`: uses unified search results; updates skeleton rendering. > - **Explore search & sections**: > - `useExploreSearch`: show top items on empty query; delegate filtering to sections; improved loading/debounce handling. > - Switch list `keyExtractor`s to stable index-based keys per section. > - `SECTIONS_CONFIG`: pass `searchQuery` to hooks; unify Perps skeleton. > - **UI/Skeletons**: > - Rework `TrendingTokensSkeleton` and `SiteSkeleton` to consistent 44px circular icon + text rows; tests adjusted. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 43099a7. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
## Version Bump After Release This PR bumps the main branch version from 7.61.0 to 7.62.0 after cutting the release branch. ### Why this is needed: - **Nightly builds**: Each nightly build needs to be one minor version ahead of the current release candidate - **Version conflicts**: Prevents conflicts between nightlies and release candidates - **Platform alignment**: Maintains version alignment between MetaMask mobile and extension - **Update systems**: Ensures nightlies are accepted by app stores and browser update systems ### What changed: - Version bumped from `7.61.0` to `7.62.0` - Platform: `mobile` - Files updated by `set-semvar-version.sh` script ### Next steps: This PR should be **manually reviewed and merged by the release manager** to maintain proper version flow. ### Related: - Release version: 7.61.0 - Release branch: release/7.61.0 - Platform: mobile - Test mode: false --- *This PR was automatically created by the `create-platform-release-pr.sh` script.* Co-authored-by: metamaskbot <metamaskbot@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.
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 : )