Skip to content

[pull] main from MetaMask:main #391

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 9 commits into from
Dec 8, 2025
Merged

[pull] main from MetaMask:main #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f2305eb
Update RemoteFeatureFlag controller version to latest
OGPoyraz Dec 5, 2025
7390374
Dedupe
OGPoyraz Dec 5, 2025
37c224c
Merge branch 'main' into ogp/7285-mobile
OGPoyraz Dec 8, 2025
c229349
feat: Update `RemoteFeatureFlag` controller version to latest (#23711)
OGPoyraz Dec 8, 2025
9c68575
fix(predict): Ensures claim button is visible on market details in hy…
kevinbluer Dec 8, 2025
4c916c3
chore: rewards remove sei ways to earn cp-7.61.0 (#23774)
VGR-GIT Dec 8, 2025
ce8509f
fix: remove deprecated URLs from allowlist (#23766)
cmd-ob Dec 8, 2025
5988b41
fix(predict): Resolves flicker / jitter on predict activity list (#23…
kevinbluer Dec 8, 2025
8166eae
fix(perps): use existing position leverage as fallback for initial le…
michalconsensys Dec 8, 2025
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
2 changes: 1 addition & 1 deletion app/components/UI/Perps/contexts/PerpsOrderContext.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const PerpsOrderProvider = ({
initialAsset,
initialDirection,
initialAmount,
initialLeverage,
initialLeverage: initialLeverage ?? existingPosition?.leverage?.value,
initialType,
});

Expand Down
1 change: 0 additions & 1 deletion app/components/UI/Predict/hooks/usePredictActivity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ export function usePredictActivity(
setIsRefreshing(true);
} else {
setIsLoading(true);
setActivity([]);
}
setError(null);

Expand Down
2 changes: 1 addition & 1 deletion app/components/UI/Predict/views/PredictMarketDetails/PredictMarketDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1033,7 +1033,7 @@ const PredictMarketDetails: React.FC<PredictMarketDetailsProps> = () => {
const renderActionButtons = () => (
<>
{(() => {
if (market?.status === PredictMarketStatus.CLOSED && hasPositivePnl) {
if (!isClaimablePositionsLoading && hasPositivePnl) {
return (
<ButtonHero
size={ButtonSizeHero.Lg}
Expand Down
Loading
Loading