fix: user balance display on buy/sell

osmosis-labs · Aug 13, 2024 · b25fdf6 · b25fdf6
1 parent 776779d
commit b25fdf6
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 22 deletions.
diff --git a/packages/web/components/complex/orders-history/cells/actions.tsx b/packages/web/components/complex/orders-history/cells/actions.tsx
@@ -110,7 +110,9 @@ const ClaimAndCloseButton = observer(
       >
         <span className="body2 flex items-center text-wosmongton-200">
           {claiming && <Spinner className="mr-2 h-2 w-2" />}
-          {t("limitOrders.claimAndClose")}
+          {order.percentFilled > order.percentClaimed
+            ? t("limitOrders.claimAndClose")
+            : t("limitOrders.close")}
         </span>
       </button>
     );

diff --git a/packages/web/components/complex/orders-history/order-modal.tsx b/packages/web/components/complex/orders-history/order-modal.tsx
@@ -172,7 +172,9 @@ const OrderDetails = observer(
 
       return order?.status === "open"
         ? "limitOrders.cancel"
-        : "limitOrders.claimAndClose";
+        : order?.percentFilled > order?.percentClaimed
+        ? "limitOrders.claimAndClose"
+        : "limitOrders.close";
     }, [order]);
 
     const orderAmount = useMemo(() => {

diff --git a/packages/web/hooks/limit-orders/use-place-limit.ts b/packages/web/hooks/limit-orders/use-place-limit.ts
@@ -378,33 +378,39 @@ export const usePlaceLimit = ({
     placeLimitMsg,
   ]);
 
-  const { data: balances, isLoading: isBalancesLoading } =
-    api.local.balances.getUserBalances.useQuery(
-      { bech32Address: account?.address ?? "" },
+  const { data, isLoading: isBalancesLoading } =
+    api.edge.assets.getUserAssets.useQuery(
+      {
+        userOsmoAddress: account?.address ?? "",
+      },
       {
         enabled: !!account?.address,
-        select: (balances) =>
-          balances.filter(
-            ({ denom }) =>
-              denom === baseAsset?.coinMinimalDenom ||
-              denom === quoteAsset?.coinMinimalDenom
+        select: ({ items }) =>
+          items.filter(
+            ({ coinMinimalDenom }) =>
+              coinMinimalDenom === baseAsset?.coinMinimalDenom ||
+              coinMinimalDenom === quoteAsset?.coinMinimalDenom
           ),
       }
     );
 
-  const quoteTokenBalance = useMemo(() => {
-    if (!balances) return;
-
-    return balances.find(({ denom }) => denom === quoteAsset?.coinMinimalDenom)
-      ?.coin;
-  }, [balances, quoteAsset]);
-
-  const baseTokenBalance = useMemo(() => {
-    if (!balances) return;
+  const baseTokenBalance = useMemo(
+    () =>
+      data?.find(
+        ({ coinMinimalDenom }) =>
+          coinMinimalDenom === baseAsset?.coinMinimalDenom
+      )?.amount,
+    [data, baseAsset]
+  );
+  const quoteTokenBalance = useMemo(
+    () =>
+      data?.find(
+        ({ coinMinimalDenom }) =>
+          coinMinimalDenom === quoteAsset?.coinMinimalDenom
+      )?.amount,
+    [data, quoteAsset]
+  );
 
-    return balances.find(({ denom }) => denom === baseAsset?.coinMinimalDenom)
-      ?.coin;
-  }, [balances, baseAsset]);
   const insufficientFunds = useMemo(() => {
     return orderDirection === "bid"
       ? (quoteTokenBalance?.toDec() ?? new Dec(0)).lt(

diff --git a/packages/web/localizations/en.json b/packages/web/localizations/en.json
@@ -1249,6 +1249,7 @@
     "filled": "Filled",
     "claimable": "Claimable",
     "claimAndClose": "Claim and close",
+    "close": "Close",
     "claim": "Claim",
     "accept": "Accept",
     "cancelled": "Cancelled",