Skip to content

fix(predict): fix claim button not showing and not working for resolved positions #27050

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

Closed
vinnyhoward wants to merge 6 commits into from
Closed

fix(predict): fix claim button not showing and not working for resolved positions #27050

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
557a442
fix: claim now works - was broken to incorrect wallet address look up
vinnyhoward Mar 5, 2026
9e8a447
Merge branch 'main' of github.com:MetaMask/metamask-mobile into fix-t…
vinnyhoward Mar 6, 2026
1e36186
fix: refactor lowercase sensitivity logic, simpflied fetching positio…
vinnyhoward Mar 6, 2026
001152a
fix: reset has claim state
vinnyhoward Mar 6, 2026
e45d136
fix: refactor and update unit tests
vinnyhoward Mar 6, 2026
9d40ff2
fix: unit test mocks
vinnyhoward Mar 6, 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
10 changes: 8 additions & 2 deletions app/components/UI/Predict/controllers/PredictController.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,8 +1595,14 @@ export class PredictController extends BaseController<

const signer = this.getSigner();

// Get claimable positions from state
const claimablePositions = this.state.claimablePositions[signer.address];
// Get claimable positions from state (case-insensitive address match)
const normalizedSignerAddress = signer.address.toLowerCase();
Copy link
Copy Markdown
Contributor

@caieu caieu Mar 5, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we create a utils function for this logic? This function can be shared for the controller and the selector.

Copy link
Copy Markdown
Contributor Author

@vinnyhoward vinnyhoward Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed 1e36186

const matchedAddress = Object.keys(this.state.claimablePositions).find(
(addressKey) => addressKey.toLowerCase() === normalizedSignerAddress,
);
const claimablePositions = matchedAddress
? this.state.claimablePositions[matchedAddress]
: undefined;

if (!claimablePositions || claimablePositions.length === 0) {
throw new Error('No claimable positions found');
Expand Down
11 changes: 7 additions & 4 deletions app/components/UI/Predict/selectors/predictController/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,13 @@ const selectPredictClaimablePositionsByAddress = ({
}: {
address: string;
}) =>
createSelector(
selectPredictClaimablePositions,
(claimablePositions) => claimablePositions[address] || [],
);
createSelector(selectPredictClaimablePositions, (claimablePositions) => {
const normalizedAddress = address.toLowerCase();
const matchedKey = Object.keys(claimablePositions).find(
(key) => key.toLowerCase() === normalizedAddress,
);
return matchedKey ? claimablePositions[matchedKey] : [];
});
Comment thread
vinnyhoward marked this conversation as resolved.

const selectPredictWonPositions = ({ address }: { address: string }) =>
createSelector(
Expand Down
39 changes: 27 additions & 12 deletions app/components/Views/Homepage/Sections/Predictions/PredictionsSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import React, {
useCallback,
useImperativeHandle,
useRef,
useState,
} from 'react';
import { ScrollView } from 'react-native';
import { useNavigation, NavigationProp } from '@react-navigation/native';
Expand Down Expand Up @@ -91,9 +92,16 @@ const PredictionsSection = forwardRef<SectionRefreshHandle>((_, ref) => {
refresh: refreshClaimable,
} = usePredictPositionsForHomepage(undefined, true);

const [isClaiming, setIsClaiming] = useState(false);

const handleClaim = useCallback(async () => {
await claim();
await refreshClaimable();
setIsClaiming(true);
try {
await claim();
await refreshClaimable();
} finally {
setIsClaiming(false);
}
}, [claim, refreshClaimable]);

const totalClaimable = claimablePositions.reduce(
Expand Down Expand Up @@ -170,8 +178,12 @@ const PredictionsSection = forwardRef<SectionRefreshHandle>((_, ref) => {
);
}

// Render positions if user has any
if (hasPositions || isLoadingPositions) {
// Render positions if user has active positions, or claimable winnings
if (
hasPositions ||
isLoadingPositions ||
(!isLoadingClaimable && totalClaimable > 0)
) {
return (
<Box gap={3}>
<SectionTitle title={title} onPress={handleViewAllPredictions} />
Expand All @@ -190,14 +202,17 @@ const PredictionsSection = forwardRef<SectionRefreshHandle>((_, ref) => {
/>
))
)}
{!isLoadingPositions && !isLoadingClaimable && totalClaimable > 0 && (
<Box paddingHorizontal={4} paddingTop={1} paddingBottom={3}>
<PredictClaimButton
amount={totalClaimable}
onPress={handleClaim}
/>
</Box>
)}
{!isLoadingPositions &&
!isLoadingClaimable &&
!isClaiming &&
totalClaimable > 0 && (
<Box paddingHorizontal={4} paddingTop={1} paddingBottom={3}>
<PredictClaimButton
amount={totalClaimable}
onPress={handleClaim}
/>
</Box>
)}
</Box>
</Box>
);
Expand Down
Loading