Skip to content

[pull] main from MetaMask:main #833

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.

Sign up for GitHub

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

Merged
pull merged 3 commits into from
Jun 15, 2026
Merged

[pull] main from MetaMask:main #833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f327cd
feat: add price alerts basic setup (#31477)
juanmigdr Jun 15, 2026
73f97de
fix: match Quick Buy token icon and chain badge styles to homepage to…
xavier-brochard Jun 15, 2026
ca846b2
feat: add suggestions to watchlist on marketlist UI (#31650)
gambinish Jun 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .js.env.example
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,9 @@ export DECODING_API_URL: 'https://signature-insights.api.cx.metamask.io/v1'
# URL of security alerts API used to validate dApp requests.
export SECURITY_ALERTS_API_URL="https://security-alerts.api.cx.metamask.io"

# URL of the price alerts API. Override to http://localhost:3333 for local dev.
export PRICE_ALERTS_API_URL="https://price-alerts.dev-api.cx.metamask.io"

# URL of the compliance API used for wallet compliance checks.
export COMPLIANCE_API_URL="https://compliance.api.cx.metamask.io"

Expand Down
10 changes: 10 additions & 0 deletions app/components/Nav/Main/MainNavigator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,8 @@ import RewardsSelectSheet from '../../UI/Rewards/components/RewardsSelectSheet';

import SitesFullView from '../../Views/SitesFullView/SitesFullView';
import { TokenDetails } from '../../UI/TokenDetails/Views/TokenDetails';
import CreatePriceAlertView from '../../UI/Assets/PriceAlerts/Views/CreatePriceAlertView/CreatePriceAlertView';
import ManagePriceAlertsView from '../../UI/Assets/PriceAlerts/Views/ManagePriceAlertsView/ManagePriceAlertsView';
import BenefitFullView from '../../UI/Rewards/Views/BenefitFullView';
import BenefitsFullView from '../../UI/Rewards/Views/BenefitsFullView';
import MoneyTabPressTracker from '../../UI/Money/components/MoneyTabPressTracker';
Expand Down Expand Up @@ -211,6 +213,14 @@ const AssetStackFlow = (props) => (
name={Routes.TRANSACTION_DETAILS}
component={TransactionDetails}
/>
<NativeStack.Screen
name={Routes.CREATE_PRICE_ALERT}
component={CreatePriceAlertView}
/>
<NativeStack.Screen
name={Routes.MANAGE_PRICE_ALERTS}
component={ManagePriceAlertsView}
/>
</NativeStack.Navigator>
);

Expand Down
1 change: 1 addition & 0 deletions app/components/UI/AssetOverview/TokenOverview.testIds.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import enContent from '../../../../locales/languages/en.json';
export const TokenOverviewSelectorsIDs = {
CONTAINER: 'token-asset-overview',
TOKEN_PRICE: 'token-price',
PRICE_ALERT_BUTTON: 'token-price-alert-button',
SEND_BUTTON: 'token-send-button',
RECEIVE_BUTTON: 'token-receive-button',
BUY_BUTTON: 'token-buy-button',
Expand Down
Loading
Loading