@devrongx/games 0.4.10 → 0.4.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devrongx/games",
-  "version": "0.4.10",
+  "version": "0.4.12",
   "description": "Game UI components for sports prediction markets",
   "license": "MIT",
   "main": "./src/index.ts",

package/src/games/prematch-bets/PreMatchBetsPopup.tsx

@@ -16,7 +16,6 @@ import { GamePopupShell } from "../../core/GamePopupShell";
 import { PreMatchIntro } from "./PreMatchIntro";
 import { PreMatchQuestions } from "./PreMatchQuestions";
 import { PreMatchGame } from "./PreMatchGame";
-import { PreMatchSubmitted } from "./PreMatchSubmitted";
 import { PreMatchLive } from "./PreMatchLive";
 import { PreMatchResults } from "./PreMatchResults";
 import { FullLeaderboard } from "./FullLeaderboard";
@@ -34,7 +33,7 @@ const GAME_ID = "pre-match";
 // ─── View logic ────────────────────────────────────────────────────────────────
 
 type UserFlowState = "intro" | "questions" | "game";
-type ActiveView = UserFlowState | "submitted" | "live" | "results";
+type ActiveView = UserFlowState | "live" | "results";
 
 function getActiveView(
   poolStatus: number | undefined,
@@ -44,8 +43,7 @@ function getActiveView(
   if (poolStatus === undefined) return userFlowState;
   if (poolStatus === TDPoolStatus.COMPLETE || poolStatus === TDPoolStatus.CANCELLED) return "results";
   if (poolStatus === TDPoolStatus.CLOSED || poolStatus === TDPoolStatus.RESOLVING) return hasEntry ? "live" : "results";
-  // Pool is open
-  if (hasEntry) return "submitted";
+  // Pool is open — user can keep editing regardless
   return userFlowState;
 }
 
@@ -123,6 +121,31 @@ export const PreMatchBetsPopup = ({ poolId, matchId: _matchId, match: matchProp
   const [submitting, setSubmitting] = useState(false);
   const [submitError, setSubmitError] = useState<string | null>(null);
 
+  // ── Real bets restore: when user has submitted bets, load them into game state ─
+  const realBetsRestoredRef = useRef(false);
+  useEffect(() => {
+    if (!poolId || !config || !entryData || realBetsRestoredRef.current) return;
+    if (entryData.bets.length === 0) return;
+    const loaded: IUserBets = {};
+    const pickers: Record<number, number> = {};
+    for (const bet of entryData.bets) {
+      if (bet.parlay_id !== null) continue;
+      const mIdx = config.markets.findIndex((m) => m.backendChallengeId === bet.challenge_id);
+      if (mIdx < 0) continue;
+      const oIdx = config.markets[mIdx].options.findIndex(
+        (o) => o.label.toLowerCase().replace(/\s+/g, "_") === bet.selected_option,
+      );
+      if (oIdx < 0) continue;
+      loaded[mIdx] = { optionIdx: oIdx, amount: bet.coin_amount, parlaySlot: null };
+      pickers[mIdx] = oIdx;
+    }
+    if (Object.keys(loaded).length === 0) return;
+    setBets(loaded);
+    setExpandedPicker(pickers);
+    setUserFlowState("game");
+    realBetsRestoredRef.current = true;
+  }, [poolId, config, entryData]);
+
   // ── Draft restore: when entry + config load, seed bets from draft_selections ─
   const draftRestoredRef = useRef(false);
   const [restoredSelections, setRestoredSelections] = useState<IUserBets | undefined>(undefined);
@@ -144,10 +167,9 @@ export const PreMatchBetsPopup = ({ poolId, matchId: _matchId, match: matchProp
     }
     const answeredCount = Object.keys(restored).length;
     if (answeredCount === 0) return;
-    const allAnswered = answeredCount === config.markets.length;
     setBets(restored);
-    if (allAnswered) {
-      // All questions done — go straight to game screen
+    if (answeredCount >= 5) {
+      // 5+ questions answered — skip straight to game screen
       setUserFlowState("game");
     } else {
       // Partial — restore into questions at the first unanswered question
@@ -277,24 +299,6 @@ export const PreMatchBetsPopup = ({ poolId, matchId: _matchId, match: matchProp
     }
   }, [poolId, config, bets, hasEntry, refetchEntry, refetchLB, refetchPool]);
 
-  const handleAdjust = useCallback(async () => {
-    // Load server bets back into local state
-    if (entryData?.bets && config) {
-      const loaded: IUserBets = {};
-      for (const bet of entryData.bets) {
-        if (bet.parlay_id !== null) continue; // skip parlays for now
-        const mIdx = config.markets.findIndex((m) => m.backendChallengeId === bet.challenge_id);
-        if (mIdx >= 0) {
-          // Find option by matching the stored key to a label approximation
-          // (we store selected_option as the label key from the pool option)
-          const oIdx = config.markets[mIdx].options.findIndex((_, i) => i === 0); // fallback: first option
-          loaded[mIdx] = { optionIdx: oIdx, amount: bet.coin_amount, parlaySlot: null };
-        }
-      }
-      setBets(loaded);
-    }
-    setUserFlowState("game");
-  }, [entryData, config]);
 
   // ── Loading ────────────────────────────────────────────────────────────────
   if (poolId && (poolLoading || (!config && !poolLoading))) {
@@ -354,17 +358,6 @@ export const PreMatchBetsPopup = ({ poolId, matchId: _matchId, match: matchProp
         />
       )}
 
-      {activeView === "submitted" && (
-        <PreMatchSubmitted
-          config={config}
-          poolId={poolId!}
-          entryData={entryData}
-          rankings={rankings}
-          onAdjust={handleAdjust}
-          onViewLeaderboard={() => setShowFullLeaderboard(true)}
-        />
-      )}
-
       {activeView === "live" && (
         <PreMatchLive
           config={config}