Merge pull request #60 from garosan/feature/group-utils

Feature/group utils
La-DAO · Nov 29, 2024 · 4757503 · 4757503
2 parents 0c0df50 + da6e066
commit 4757503
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 98 deletions.
diff --git a/packages/nextjs/app/cdp/components/modals/DepositModal.tsx b/packages/nextjs/app/cdp/components/modals/DepositModal.tsx
@@ -8,6 +8,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId, useReadContract, useWaitForTransactionReceipt, useWriteContract } from "wagmi";
 import { ERC20ABI } from "~~/app/components/abis/erc20";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 import { useBalanceOf } from "~~/hooks/useBalanceOf";
 import { useDeposit } from "~~/hooks/useDeposit";
 
@@ -86,18 +87,6 @@ const DepositModal: React.FC<DepositModalProps> = ({
     depositHash,
   } = useDeposit(houseOfReserveContract as Address);
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${depositHash}`;
 
   useEffect(() => {

diff --git a/packages/nextjs/app/cdp/components/modals/MintModal.tsx b/packages/nextjs/app/cdp/components/modals/MintModal.tsx
@@ -5,6 +5,7 @@ import { faClipboardCheck } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId } from "wagmi";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 
 interface MintModalProps {
   isOpen: boolean;
@@ -102,18 +103,6 @@ const MintModal: React.FC<MintModalProps> = ({
     onClose();
   };
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${mintingHash}`;
 
   if (!isOpen) return null;

diff --git a/packages/nextjs/app/cdp/components/modals/RepayModal.tsx b/packages/nextjs/app/cdp/components/modals/RepayModal.tsx
@@ -4,6 +4,7 @@ import { faClipboardCheck } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId } from "wagmi";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 import useRepayCPD from "~~/hooks/useRepayCDP";
 
 interface RepayModalProps {
@@ -91,18 +92,6 @@ const RepayModal: React.FC<RepayModalProps> = ({ isOpen, onClose, backedTokenID,
     onClose();
   };
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${repayHash}`;
 
   if (!isOpen) return null;

diff --git a/packages/nextjs/app/cdp/components/modals/WithdrawModal.tsx b/packages/nextjs/app/cdp/components/modals/WithdrawModal.tsx
@@ -7,6 +7,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address, formatEther } from "viem";
 import { useChainId, useReadContract, useWaitForTransactionReceipt } from "wagmi";
 import { houseOfReserveABI } from "~~/app/components/abis/houseofreserve";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 import { useWithdraw } from "~~/hooks/useWithdrawCDP";
 
 interface WithdrawModalProps {
@@ -62,18 +63,6 @@ const WithdrawModal: React.FC<WithdrawModalProps> = ({ isOpen, onClose, assetNam
     withdrawHash,
   } = useWithdraw(houseOfReserveContract as Address);
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${withdrawHash}`;
 
   const { isLoading: isWithdrawLoading, isSuccess: isWithdrawSuccess } = useWaitForTransactionReceipt({

diff --git a/packages/nextjs/app/cdp/components/tables/DepositTable.tsx b/packages/nextjs/app/cdp/components/tables/DepositTable.tsx
@@ -80,6 +80,7 @@ const DepositTable: React.FC = () => {
   const { t } = useTranslation();
   // Get the chain ID
   const chainId = useChainId();
+
   // Define the state variables
   const [isModalOpen, setIsModalOpen] = useState(false);
   const [isWithdrawModalOpen, setIsWithdrawModalOpen] = useState(false);
@@ -126,7 +127,7 @@ const DepositTable: React.FC = () => {
   };
 
   return (
-    <div className="overflow-x-auto">
+    <div>
       <table className="min-w-full divide-y divide-gray-200">
         <thead>
           <tr className="text-center">

diff --git a/packages/nextjs/app/cdp/components/tables/YourDeposits.tsx b/packages/nextjs/app/cdp/components/tables/YourDeposits.tsx
@@ -400,7 +400,7 @@ const YourDeposits = () => {
   const chainDeposits = deposits[chainId] || [];
   const allDepositsZero = formattedBalances.every(balance => balance === 0);
   return (
-    <div className="rounded-md overflow-x-auto">
+    <div className="rounded-md">
       {/* Section for displaying the user's deposits */}
       {chainDeposits.length > 0 && !allDepositsZero ? (
         <>

diff --git a/packages/nextjs/app/lending/components/modals/BorrowTransactionModal.tsx b/packages/nextjs/app/lending/components/modals/BorrowTransactionModal.tsx
@@ -9,6 +9,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId } from "wagmi";
 import { useTranslation } from "~~/app/context/LanguageContext";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 
 interface ModalProps {
   isOpen: boolean;
@@ -46,18 +47,6 @@ const BorrowTransactionModal: React.FC<ModalProps> = ({ isOpen, onClose, reserve
   // Fetch the user's wallet address
   const { address: walletAddress } = useAccountAddress();
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${borrowHash}`;
 
   useEffect(() => {

diff --git a/packages/nextjs/app/lending/components/modals/RepayTransactionModal.tsx.tsx b/packages/nextjs/app/lending/components/modals/RepayTransactionModal.tsx.tsx
@@ -10,6 +10,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId } from "wagmi";
 import { useTranslation } from "~~/app/context/LanguageContext";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 import useRepay from "~~/hooks/useRepay";
 
 interface ModalProps {
@@ -50,18 +51,6 @@ const RepayTransactionModal: React.FC<ModalProps> = ({ isOpen, onClose, reserve,
     isPending: approvePending,
   } = useApproval(CONFIG.POOL, reserve?.underlyingAsset as Address); // Using the useApproval hook
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${repayHash}`;
 
   useEffect(() => {

diff --git a/packages/nextjs/app/lending/components/modals/SupplyTransactionModal.tsx b/packages/nextjs/app/lending/components/modals/SupplyTransactionModal.tsx
@@ -11,6 +11,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId } from "wagmi";
 import { useTranslation } from "~~/app/context/LanguageContext";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 
 interface ModalProps {
   isOpen: boolean;
@@ -173,18 +174,6 @@ const SupplyTransactionModal: React.FC<ModalProps> = ({ isOpen, onClose, reserve
     onClose();
   };
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${supplyHash}`;
 
   if (!isOpen || !reserve) {

diff --git a/packages/nextjs/app/lending/components/modals/WithdrawTransactionModal.tsx b/packages/nextjs/app/lending/components/modals/WithdrawTransactionModal.tsx
@@ -8,6 +8,7 @@ import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { Address } from "viem";
 import { useChainId } from "wagmi";
 import { useTranslation } from "~~/app/context/LanguageContext";
+import { getBlockExplorerUrl } from "~~/app/utils/blockExplorer";
 import useWithdraw from "~~/hooks/useWithdraw";
 
 interface ModalProps {
@@ -39,18 +40,6 @@ const WithdrawTransactionModal: React.FC<ModalProps> = ({ isOpen, onClose, reser
   const { handleWithdraw, isError: withdrawError, error, withdrawHash } = useWithdraw();
   const { address: walletAddress } = useAccountAddress();
 
-  const getBlockExplorerUrl = (chainId: number): string => {
-    switch (chainId) {
-      case 56: // BNB Smart Chain Mainnet
-        return "https://bscscan.com/tx/";
-      case 137: // Polygon Mainnet
-        return "https://polygonscan.com/tx/";
-      case 8453: // Base Mainnet
-        return "https://basescan.org/tx/";
-      default:
-        return ""; // Fallback for unsupported networks
-    }
-  };
   const blockExplorerUrl = `${getBlockExplorerUrl(chainId)}${withdrawHash}`;
 
   useEffect(() => {

diff --git a/packages/nextjs/app/utils/blockExplorer.ts b/packages/nextjs/app/utils/blockExplorer.ts
@@ -0,0 +1,12 @@
+export const getBlockExplorerUrl = (chainId: number): string => {
+  switch (chainId) {
+    case 56: // BNB Smart Chain Mainnet
+      return "https://bscscan.com/tx/";
+    case 137: // Polygon Mainnet
+      return "https://polygonscan.com/tx/";
+    case 8453: // Base Mainnet
+      return "https://basescan.org/tx/";
+    default:
+      return ""; // Fallback for unsupported networks
+  }
+};