feat: removed unnecessary useeffect, modfied btc entry point return i…

…f balance is undefined
leather-io · Dec 14, 2023 · c858abb · c858abb
1 parent bc909cf
commit c858abb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 12 deletions.
diff --git a/src/app/components/bitcoin-contract-entry-point/bitcoin-contract-entry-point-layout.tsx b/src/app/components/bitcoin-contract-entry-point/bitcoin-contract-entry-point-layout.tsx
@@ -26,7 +26,7 @@ export function BitcoinContractEntryPointLayout(props: BitcoinContractEntryPoint
     : balance.amount.toString();
   const formattedBalance = formatBalance(amount);
 
-  if (Number(balance.amount) === 0) return false;
+  if (Number(balance.amount) === 0) return null;
 
   return (
     <Flex cursor={cursor} onClick={onClick} outline={0}>

diff --git a/src/app/query/bitcoin/balance/bitcoin-contracts-balance.hooks.ts b/src/app/query/bitcoin/balance/bitcoin-contracts-balance.hooks.ts
@@ -1,4 +1,4 @@
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo } from 'react';
 
 import BigNumber from 'bignumber.js';
 
@@ -13,14 +13,6 @@ import { useBitcoinContractsBalanceQuery } from './bitcoin-contracts-balance.que
 export function useGetBitcoinContractsBalance() {
   const calculateFiatValue = useCalculateBitcoinFiatValue();
   const { data: bitcoinContractsBalance, isLoading } = useBitcoinContractsBalanceQuery();
-  const [bitcoinContractsBalanceInUSD, setBitcoinContractsBalanceInUSD] = useState<string>('0');
-
-  useEffect(() => {
-    if (isUndefined(bitcoinContractsBalance)) return;
-    setBitcoinContractsBalanceInUSD(
-      i18nFormatCurrency(calculateFiatValue(createMoney(bitcoinContractsBalance.amount, 'BTC')))
-    );
-  }, [bitcoinContractsBalance, calculateFiatValue]);
 
   return useMemo(() => {
     if (isUndefined(bitcoinContractsBalance))
@@ -31,8 +23,10 @@ export function useGetBitcoinContractsBalance() {
       };
     return {
       bitcoinContractsBalance,
-      bitcoinContractsBalanceInUSD: bitcoinContractsBalanceInUSD,
+      bitcoinContractsBalanceInUSD: i18nFormatCurrency(
+        calculateFiatValue(createMoney(bitcoinContractsBalance.amount, 'BTC'))
+      ),
       isLoading,
     };
-  }, [bitcoinContractsBalance, bitcoinContractsBalanceInUSD, isLoading]);
+  }, [bitcoinContractsBalance, isLoading, calculateFiatValue]);
 }