ui

renegade-fi · Feb 14, 2024 · 2174671 · 2174671
1 parent 9b7fffc
commit 2174671
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/trade.renegade.fi/app/providers.tsx b/trade.renegade.fi/app/providers.tsx
@@ -225,6 +225,7 @@ export function Providers({
                   <ExchangeProvider>
                     <AppProvider tokenIcons={icons}>
                       <Toaster
+                        position="bottom-center"
                         toastOptions={{
                           style: {
                             background: "black",

diff --git a/trade.renegade.fi/components/panels/wallets-panel.tsx b/trade.renegade.fi/components/panels/wallets-panel.tsx
@@ -5,7 +5,7 @@ import Image from "next/image"
 import { useRouter } from "next/navigation"
 import { ViewEnum, useApp } from "@/contexts/App/app-context"
 import { useRenegade } from "@/contexts/Renegade/renegade-context"
-import { TaskType } from "@/contexts/Renegade/types"
+import { TaskState, TaskType } from "@/contexts/Renegade/types"
 import {
   ArrowDownIcon,
   ArrowUpIcon,
@@ -178,7 +178,7 @@ function RenegadeWalletPanel(props: RenegadeWalletPanelProps) {
       ([_, b]) => [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" ? (
-                <CheckIcon height="4" />
+                <CheckIcon color="white.60" height="4" />
               ) : (
-                <Spinner size="xs" />
+                <Spinner color="white.60" size="xs" />
               )
             return (
               <Flex
@@ -346,10 +354,10 @@ function HistorySection() {
                     </Text>
                   </Flex>
                   <Flex alignItems="center" gap="2">
+                    {task.status?.state !== "Completed" && <>{rightIcon}</>}
                     <Text color="white.80" fontSize="0.8em">
-                      {task.status?.state}
+                      {TASK_TO_NAME[task.status?.state as TaskState]}
                     </Text>
-                    {task.status?.state !== "Completed" && <>{rightIcon}</>}
                   </Flex>
                 </Flex>
               </Flex>

diff --git 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
@@ -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)