diff --git a/trade.renegade.fi/app/providers.tsx b/trade.renegade.fi/app/providers.tsx index 6481a3df..6c6b6170 100644 --- a/trade.renegade.fi/app/providers.tsx +++ b/trade.renegade.fi/app/providers.tsx @@ -225,6 +225,7 @@ export function Providers({ [b.mint.address, b.amount] ) const placeholders: Array<[string, bigint]> = tokenMappings.tokens - .filter((t) => !nonzero.some(([a]) => a === t.address)) + .filter((t) => !nonzero.some(([a]) => `0x${a}` === t.address)) .map((t) => [t.address.replace("0x", ""), BigInt(0)]) return [...nonzero, ...placeholders] }, [balances]) @@ -298,6 +298,14 @@ function HistorySection() { return type } } + const TASK_TO_NAME = { + // [TaskState.Queued]: "Queued", + [TaskState.Proving]: "Proving", + [TaskState.SubmittingTx]: "Submitting Transaction", + [TaskState.FindingOpening]: "Validating", + [TaskState.UpdatingValidityProofs]: "Validating", + [TaskState.Completed]: "Completed", + } const Content = useMemo(() => { if (true) { @@ -314,9 +322,9 @@ function HistorySection() { const rightIcon = task.status?.state === "Completed" ? ( - + ) : ( - + ) return ( + {task.status?.state !== "Completed" && <>{rightIcon}} - {task.status?.state} + {TASK_TO_NAME[task.status?.state as TaskState]} - {task.status?.state !== "Completed" && <>{rightIcon}} diff --git a/trade.renegade.fi/components/task-status.tsx b/trade.renegade.fi/components/task-status.tsx index 5b561110..dcf57380 100644 --- a/trade.renegade.fi/components/task-status.tsx +++ b/trade.renegade.fi/components/task-status.tsx @@ -149,9 +149,7 @@ export const TaskStatus = () => { [TaskState.Proving]: "Generating ZK Proof", [TaskState.SubmittingTx]: "Submitting Transaction", [TaskState.FindingOpening]: "Finding New Merkle Opening", - // TODO: Make sure this works for CreateNewWalletTask - // @ts-ignore - [TaskState.FindingMerkleOpening]: "Finding New Merkle Opening", + FindingMerkleOpening: "Finding New Merkle Opening", [TaskState.UpdatingValidityProofs]: "Updating Validity Proofs", [TaskState.Completed]: "Completed", }[taskState || TaskState.Proving] // If taskState is undefined, we won't use this displayedTaskState anyway. diff --git a/trade.renegade.fi/hooks/use-order.ts b/trade.renegade.fi/hooks/use-order.ts index e3334702..bb32ec35 100644 --- a/trade.renegade.fi/hooks/use-order.ts +++ b/trade.renegade.fi/hooks/use-order.ts @@ -3,6 +3,7 @@ import { useRenegade } from "@/contexts/Renegade/renegade-context" import { Order, OrderId } from "@renegade-fi/renegade-js" import { safeLocalStorageGetItem, safeLocalStorageSetItem } from "@/lib/utils" +import { renegade } from "@/app/providers" export const useOrders = () => { const { accountId } = useRenegade() @@ -16,16 +17,16 @@ export const useOrders = () => { ? existingOrders.split(",") : [] - // const fetchedOrders = await renegade - // .queryWallet(accountId) - // .then(() => renegade.getOrders(accountId)) - // setOrders(fetchedOrders) + const fetchedOrders = await renegade + .queryWallet(accountId) + .then(() => renegade.getOrders(accountId)) + setOrders(fetchedOrders) - // const uniqueNewOrderIds = Object.keys(fetchedOrders).filter( - // (orderId) => !existingOrdersArray.includes(orderId) - // ) + const uniqueNewOrderIds = Object.keys(fetchedOrders).filter( + (orderId) => !existingOrdersArray.includes(orderId) + ) - // existingOrdersArray.push(...uniqueNewOrderIds) + existingOrdersArray.push(...uniqueNewOrderIds) const updatedOrders = existingOrdersArray.join(",") safeLocalStorageSetItem(`orders-${accountId}`, updatedOrders)