Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 34 additions & 1 deletion app/components/UI/Predict/controllers/PredictController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1423,7 +1423,40 @@ export class PredictController extends BaseController<
throw new Error('Failed to prepare claim transaction');
}

const { transactions, chainId } = prepareClaimResult;
const {
transactions,
chainId,
relayerTransactionId,
submittedViaRelayer,
} = prepareClaimResult;

if (submittedViaRelayer) {
const batchId =
relayerTransactionId ?? `deposit-wallet-claim-${Date.now()}`;

provider.confirmClaim?.({
positions: claimablePositions,
signer,
});

this.update((state) => {
delete state.pendingClaims[signer.address];
state.claimablePositions[signer.address] = [];
state.lastError = null;
state.lastUpdateTimestamp = Date.now();
});

traceData = {
success: true,
positionCount: claimablePositions.length,
};

return {
batchId,
chainId,
status: PredictClaimStatus.CONFIRMED,
};
}

if (!transactions || transactions.length === 0) {
throw new Error('No transactions returned from claim preparation');
Expand Down
7 changes: 6 additions & 1 deletion app/components/UI/Predict/hooks/usePredictClaim.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { ensureError } from '../utils/predictErrorHandler';
import { usePredictTrading } from './usePredictTrading';
import { ConfirmationLoader } from '../../../Views/confirmations/components/confirm/confirm-component';
import Routes from '../../../../constants/navigation/Routes';
import { PredictClaimStatus } from '../types';

export const usePredictClaim = () => {
const { navigateToConfirmation } = useConfirmNavigation();
Expand Down Expand Up @@ -57,7 +58,11 @@ export const usePredictClaim = () => {
// TODO: remove once navigation stack is fixed properly
stack: Routes.PREDICT.ROOT,
});
await claimWinnings({});
const result = await claimWinnings({});

if (result?.status === PredictClaimStatus.CONFIRMED) {
navigation.goBack();
}
} catch (err) {
Logger.error(ensureError(err), {
tags: {
Expand Down
Loading
Loading