Skip to content
Merged
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
9 changes: 0 additions & 9 deletions packages/keychain/src/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,6 @@ import { StandaloneSessionCreation } from "./connect/StandaloneSessionCreation";
import { StandaloneConnect } from "./connect/StandaloneConnect";
import { hasApprovalPolicies } from "@/hooks/session";
import { PurchaseStarterpack } from "./purchasenew/starterpack/starterpack";
import { Quests } from "./quests";
import { QuestClaim } from "./quests/claim";
import { CoinbasePopup } from "./coinbase-popup";
import { PopupAuth } from "./PopupAuth";

Expand Down Expand Up @@ -399,8 +397,6 @@ export function App() {
/>
<Route path="activity" element={<Activity />} />
<Route path="achievements" element={<Achievements />} />
<Route path="quests" element={<Quests />} />
<Route path="quests/:id/claim" element={<QuestClaim />} />
<Route path="leaderboard" element={<Leaderboard />} />
<Route path="trophies" element={<RedirectAchievements />} />

Expand Down Expand Up @@ -478,11 +474,6 @@ export function App() {
path="slot/:project/achievements/:address"
element={<Achievements />}
/>
<Route path="slot/:project/quests" element={<Quests />} />
<Route
path="slot/:project/quests/:id/claim"
element={<QuestClaim />}
/>
<Route path="slot/:project/leaderboard" element={<Leaderboard />} />
<Route
path="slot/:project/leaderboard/:address"
Expand Down
4 changes: 2 additions & 2 deletions packages/keychain/src/components/bottom-nav.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import {
import { useMemo } from "react";
import { useConnection } from "@/hooks/connection";
import { useData } from "@/hooks/data";
import { useQuestContext } from "@/context/quest";

export function LayoutBottomNav() {
const { namespace, project } = useConnection();
Expand All @@ -22,7 +21,8 @@ export function LayoutBottomNav() {
const {
trophies: { supportsAchievements },
} = useData();
const { supportsQuests } = useQuestContext();
// const { supportsQuests } = useQuestContext();
const supportsQuests = false;

const active = useMemo<
| "inventory"
Expand Down
5 changes: 1 addition & 4 deletions packages/keychain/src/components/provider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { FeatureProvider } from "@/hooks/features";
import { ArcadeProvider as ProfileArcadeProvider } from "@/components/provider/arcade";
import { DataProvider as ProfileDataProvider } from "@/components/provider/data";
import { ToastProvider } from "@/context";
import { QuestProvider } from "@/context/quest";
import { IndexerAPIProvider } from "@cartridge/ui/utils/api/indexer";
import { CartridgeAPIProvider } from "@cartridge/ui/utils/api/cartridge";
import { ErrorBoundary } from "../ErrorBoundary";
Expand Down Expand Up @@ -94,9 +93,7 @@ export function Provider({ children }: PropsWithChildren) {
config={marketplaceConfig}
>
<ProfileDataProvider>
<QuestProvider>
{children}
</QuestProvider>
{children}
</ProfileDataProvider>
</MarketplaceClientProvider>
</ProfileArcadeProvider>
Expand Down
11 changes: 11 additions & 0 deletions packages/keychain/src/components/purchasenew/pending/base.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ export interface TransactionPendingBaseProps {
buttonText: string;
/** Optional quantity text to show in Receiving component */
quantityText?: string;
/** Callback function to handle completion */
onCompleted?: () => void;
}

/**
Expand All @@ -43,6 +45,7 @@ export function TransactionPendingBase({
completedTitle,
buttonText,
quantityText,
onCompleted,
}: TransactionPendingBaseProps) {
const { isMainnet, controller } = useConnection();
const handlePlay = useStarterpackPlayHandler();
Expand All @@ -69,6 +72,14 @@ export function TransactionPendingBase({
}
}, [controller, transactionHash]);

useEffect(() => {
if (!isPending && onCompleted) {
setTimeout(() => {
onCompleted();
}, 1000);
}
}, [isPending, onCompleted]);

const receivingTitle = quantityText
? `Receiving ${quantityText}`
: "Receiving";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { useStarterpackContext, useOnchainPurchaseContext } from "@/context";
import { ClaimPending } from "./claim";
import { PurchasePending } from "./purchase";
import { BridgePending } from "./bridge";
import { useConnection } from "@/hooks/connection";

// Re-export components for external use
export { ClaimPending } from "./claim";
Expand Down Expand Up @@ -30,6 +31,7 @@ export function Pending() {
selectedPlatform,
isApplePaySelected,
} = useOnchainPurchaseContext();
const { closeModal } = useConnection();

// Claim flow (merkle drop)
if (starterpackDetails?.type === "claimed") {
Expand Down Expand Up @@ -77,6 +79,7 @@ export function Pending() {
name={starterpackDetails?.name || "Items"}
items={purchaseItems}
transactionHash={transactionHash!}
onCompleted={closeModal}
/>
);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ export interface PurchasePendingProps {
name: string;
items: Item[];
transactionHash: string;
onCompleted?: () => void;
}

/**
Expand All @@ -14,6 +15,7 @@ export function PurchasePending({
name,
items,
transactionHash,
onCompleted,
}: PurchasePendingProps) {
return (
<TransactionPendingBase
Expand All @@ -23,6 +25,7 @@ export function PurchasePending({
confirmingTitle="Confirming on Starknet"
completedTitle="Confirmed on Starknet"
buttonText="Play"
onCompleted={onCompleted}
/>
);
}
4 changes: 0 additions & 4 deletions packages/keychain/src/context/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
export { NavigationProvider, useNavigation } from "./navigation";
export { ToastProvider, useToast } from "./toast";
// Quest context must be imported directly from "@/context/quest" to avoid
// WASM loading issues in tests. Do not re-export from barrel.
// export { QuestProvider, useQuestContext } from "./quest";
// export type { QuestProps } from "./quest";

// Starterpack contexts (all flow-specific contexts)
export {
Expand Down
Loading