fix: style font size smaller, optimize variable calculations

kleros · Sep 30, 2024 · f62a9eb · f62a9eb
1 parent 3898aeb
commit f62a9eb
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 53 deletions.
diff --git a/web/src/pages/MyTransactions/TransactionDetails/PreviewCardButtons/RaiseDisputeButton.tsx b/web/src/pages/MyTransactions/TransactionDetails/PreviewCardButtons/RaiseDisputeButton.tsx
@@ -1,6 +1,6 @@
 import React, { useMemo, useState } from "react";
 import { Button } from "@kleros/ui-components-library";
-import { useAccount, usePublicClient } from "wagmi";
+import { useAccount, useBalance, usePublicClient } from "wagmi";
 import {
   useWriteEscrowUniversalPayArbitrationFeeByBuyer,
   useWriteEscrowUniversalPayArbitrationFeeBySeller,
@@ -11,6 +11,8 @@ import { isUndefined } from "utils/index";
 import { wrapWithToast } from "utils/wrapWithToast";
 import { useTransactionDetailsContext } from "context/TransactionDetailsContext";
 import { useQueryRefetch } from "hooks/useQueryRefetch";
+import ClosedCircleIcon from "components/StyledIcons/ClosedCircleIcon";
+import { ErrorButtonMessage } from "pages/NewTransaction/NavigationButtons/DepositPaymentButton";
 
 interface IRaiseDisputeButton {
   toggleModal?: () => void;
@@ -25,29 +27,33 @@ const RaiseDisputeButton: React.FC<IRaiseDisputeButton> = ({ toggleModal, button
   const { buyer, id } = useTransactionDetailsContext();
   const isBuyer = useMemo(() => address?.toLowerCase() === buyer?.toLowerCase(), [address, buyer]);
   const refetchQuery = useQueryRefetch();
+  const { data: balanceData } = useBalance({
+    address: address as `0x${string}` | undefined,
+  });
 
-  const { data: payArbitrationFeeByBuyerConfig, isLoading: isPreparingBuyerConfig } =
-    useSimulateEscrowUniversalPayArbitrationFeeByBuyer({
-      query: {
-        enabled: isBuyer,
-      },
-      args: [BigInt(id)],
-      value: arbitrationCost,
-    });
+  const insufficientBalance = parseFloat(arbitrationCost.toString()) > parseFloat(balanceData?.value.toString() || "0");
 
-  const { data: payArbitrationFeeBySellerConfig, isLoading: isPreparingSellerConfig } =
-    useSimulateEscrowUniversalPayArbitrationFeeBySeller({
-      query: {
-        enabled: !isBuyer,
-      },
-      args: [BigInt(id)],
-      value: arbitrationCost,
-    });
+  const { data: payArbitrationFeeByBuyerConfig } = useSimulateEscrowUniversalPayArbitrationFeeByBuyer({
+    query: {
+      enabled: isBuyer,
+    },
+    args: [BigInt(id)],
+    value: arbitrationCost,
+  });
+
+  const { data: payArbitrationFeeBySellerConfig } = useSimulateEscrowUniversalPayArbitrationFeeBySeller({
+    query: {
+      enabled: !isBuyer,
+    },
+    args: [BigInt(id)],
+    value: arbitrationCost,
+  });
 
   const { writeContractAsync: payArbitrationFeeByBuyer } =
     useWriteEscrowUniversalPayArbitrationFeeByBuyer(payArbitrationFeeByBuyerConfig);
-  const { writeContractAsync: payArbitrationFeeBySeller } =
-    useWriteEscrowUniversalPayArbitrationFeeBySeller(payArbitrationFeeBySellerConfig);
+  const { writeContractAsync: payArbitrationFeeBySeller } = useWriteEscrowUniversalPayArbitrationFeeBySeller(
+    payArbitrationFeeBySellerConfig
+  );
 
   const handleRaiseDispute = () => {
     if (isBuyer && !isUndefined(payArbitrationFeeByBuyer)) {
@@ -84,12 +90,19 @@ const RaiseDisputeButton: React.FC<IRaiseDisputeButton> = ({ toggleModal, button
   };
 
   return (
-    <Button
-      isLoading={isSending || isPreparingBuyerConfig || isPreparingSellerConfig}
-      disabled={isSending || isPreparingBuyerConfig || isPreparingSellerConfig}
-      text={buttonText}
-      onClick={handleRaiseDispute}
-    />
+    <div>
+      <Button
+        isLoading={isSending}
+        disabled={isSending || insufficientBalance}
+        text={buttonText}
+        onClick={handleRaiseDispute}
+      />
+      {insufficientBalance && (
+        <ErrorButtonMessage>
+          <ClosedCircleIcon /> Insufficient balance
+        </ErrorButtonMessage>
+      )}
+    </div>
   );
 };
 

diff --git a/web/src/pages/NewTransaction/NavigationButtons/DepositPaymentButton.tsx b/web/src/pages/NewTransaction/NavigationButtons/DepositPaymentButton.tsx
@@ -29,13 +29,14 @@ import ClosedCircleIcon from "components/StyledIcons/ClosedCircleIcon";
 
 const StyledButton = styled(Button)``;
 
-const ErrorMessage = styled.div`
+export const ErrorButtonMessage = styled.div`
   display: flex;
   align-items: center;
   gap: 4px;
   justify-content: center;
   margin: 12px;
   color: ${({ theme }) => theme.error};
+  font-size: 14px;
 `;
 
 const DepositPaymentButton: React.FC = () => {
@@ -49,10 +50,8 @@ const DepositPaymentButton: React.FC = () => {
     deadline,
     sendingToken,
     resetContext,
-    setHasSufficientNativeBalance,
   } = useNewTransactionContext();
 
-  const [finalRecipientAddress, setFinalRecipientAddress] = useState(sellerAddress);
   const publicClient = usePublicClient();
   const navigateAndScrollTop = useNavigateAndScrollTop();
   const refetchQuery = useQueryRefetch();
@@ -67,32 +66,14 @@ const DepositPaymentButton: React.FC = () => {
     [isNativeTransaction, sendingQuantity]
   );
 
+  const finalRecipientAddress = ensResult.data || sellerAddress;
+
   const { data: balanceData } = useBalance({
     address: address as `0x${string}` | undefined,
-    token: isNativeTransaction ? undefined : sendingToken?.address as `0x${string}` | undefined,
+    token: isNativeTransaction ? undefined : (sendingToken?.address as `0x${string}` | undefined),
   });
 
-  const [error, setError] = useState<string | null>(null);
-
-  useEffect(() => {
-    setFinalRecipientAddress(ensResult.data || sellerAddress);
-  }, [sellerAddress, ensResult.data]);
-
-  useEffect(() => {
-    const balance = parseFloat(balanceData?.formatted || "0");
-    const quantity = parseFloat(sendingQuantity);
-
-    if (quantity > balance) {
-      setError("Insufficient balance");
-      setHasSufficientNativeBalance(false);
-    } else if (quantity === 0) {
-      setError("Amount cannot be zero");
-      setHasSufficientNativeBalance(false);
-    } else {
-      setError(null);
-      setHasSufficientNativeBalance(true);
-    }
-  }, [balanceData, sendingQuantity, setHasSufficientNativeBalance]);
+  const insufficientBalance = parseFloat(sendingQuantity) > parseFloat(balanceData?.value.toString() || "0");
 
   const { data: allowance, refetch: refetchAllowance } = useReadContract({
     query: { enabled: !isNativeTransaction && chain?.id },
@@ -187,12 +168,15 @@ const DepositPaymentButton: React.FC = () => {
     <div>
       <StyledButton
         isLoading={isSending}
-        disabled={isSending || !!error}
-        tooltip={error}
+        disabled={isSending || insufficientBalance}
         text={isNativeTransaction || isApproved ? "Deposit the Payment" : "Approve Token"}
         onClick={isNativeTransaction || isApproved ? handleCreateTransaction : handleApproveToken}
       />
-      {error ? <ErrorMessage><ClosedCircleIcon /> {error}</ErrorMessage> : null}
+      {insufficientBalance && (
+        <ErrorButtonMessage>
+          <ClosedCircleIcon /> Insufficient balance
+        </ErrorButtonMessage>
+      )}
     </div>
   );
 };