fix: get address balance

AstraProtocol · Dec 9, 2022 · 52af944 · 52af944
1 parent 5202b15
commit 52af944
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 38 deletions.
diff --git a/api/api_list.ts b/api/api_list.ts
@@ -31,7 +31,7 @@ const API_LIST = {
 	ADDRESS_DETAIL: '/api/v1/accounts/detail',
 	ADDRESS_TOKEN: 'evm_/api/v1?module=account&action=tokenlist', // address = ?
 	ADDRESS_COUNTER: '/api/v1/accounts', // address=?
-	ADDRESS_BALANCE: 'evm_/api/v1?module=account&action=balance', // address=?
+	// ADDRESS_BALANCE: 'evm_/api/v1?module=account&action=balance', // address=?
 	ADDRESS_COIN_BALANCE_HISTORY: 'evm_/api/v1?module=account&action=getcoinbalancehistory', // address, page, offset=?
 	ADDRESS_COIN_BALANCE_HISTORY_CHART: 'evm_/address', // address, page, offset=?
 	ADDRESS_TRANSACTION: '/api/v1/accounts',

diff --git a/views/accounts/AddressOverview.tsx b/views/accounts/AddressOverview.tsx
@@ -11,7 +11,6 @@ import { useAppSelector } from 'store/hooks'
 import { AddressTypeEnum } from 'utils/enum'
 
 import { convertBalanceToView, formatCurrencyValue, LinkMaker } from 'utils/helper'
-import useAddressBalance from './hook/useAddressBalance'
 import useAddressCounter from './hook/useAddressCounter'
 import styles from './style.module.scss'
 
@@ -22,7 +21,7 @@ interface Props {
 
 const AddressOverview = ({ address, addressData }: Props) => {
 	const addressCounter = useAddressCounter(address)
-	const addressBalance = useAddressBalance(address)
+	// const addressBalance = useAddressBalance(address)
 	const astraSummary = useAppSelector(getAstraSummary)
 
 	const isContract = addressData.type === AddressTypeEnum.Contract
@@ -79,19 +78,15 @@ const AddressOverview = ({ address, addressData }: Props) => {
 					<TypographyUI.Balance
 						size="sm"
 						currency={
-							astraSummary && addressBalance.balance
+							astraSummary && addressData.balance
 								? `(${formatCurrencyValue(
-										(astraSummary.last * parseInt(addressBalance.balance)) / 10 ** 18,
+										(astraSummary.last * parseInt(addressData.balance)) / 10 ** 18,
 										'VND'
 								  )})`
 								: ''
 						}
 						icon={<CryptoIcon name="asa" size="sm" />}
-						value={
-							addressBalance.balance
-								? convertBalanceToView(addressBalance.balance)
-								: addressBalance.balance
-						}
+						value={addressData.balance ? convertBalanceToView(addressData.balance) : addressData.balance}
 						fixNumber={5}
 					/>
 				</div>
@@ -124,9 +119,9 @@ const AddressOverview = ({ address, addressData }: Props) => {
 					<span className="text text-base contrast-color-50">Last balance updated:</span>
 					<br />
 
-					{addressBalance.lastBalanceUpdate ? (
-						<LinkText href={LinkMaker.block(addressBalance.lastBalanceUpdate)}>
-							{addressBalance.lastBalanceUpdate}
+					{addressData.lastBalanceUpdate ? (
+						<LinkText href={LinkMaker.block(addressData.lastBalanceUpdate)}>
+							{addressData.lastBalanceUpdate}
 						</LinkText>
 					) : (
 						<span className="text text-base">NaN</span>

diff --git a/views/accounts/hook/useAddressBalance.ts b/views/accounts/hook/useAddressBalance.ts
@@ -1,27 +1,27 @@
-import API_LIST from 'api/api_list'
-import { useEffect, useState } from 'react'
-import useSWR from 'swr'
+// import API_LIST from 'api/api_list'
+// import { useEffect, useState } from 'react'
+// import useSWR from 'swr'
 
-export default function useAddressBalance(address: string) {
-	const [hookData, setState] = useState<UseAddressBalanceData>({ balance: '', lastBalanceUpdate: 0 })
+// export default function useAddressBalance(address: string) {
+// 	const [hookData, setState] = useState<UseAddressBalanceData>({ balance: '', lastBalanceUpdate: 0 })
 
-	const _fetchCondition = () => {
-		return [
-			API_LIST.ADDRESS_BALANCE,
-			{
-				address
-			}
-		]
-	}
-	const { data } = useSWR<AddressBalanceResponse>(_fetchCondition())
+// 	const _fetchCondition = () => {
+// 		return [
+// 			API_LIST.ADDRESS_BALANCE,
+// 			{
+// 				address
+// 			}
+// 		]
+// 	}
+// 	const { data } = useSWR<AddressBalanceResponse>(_fetchCondition())
 
-	useEffect(() => {
-		if (data?.result) {
-			setState(data.result)
-		}
-	}, [data])
-	return {
-		balance: hookData.balance,
-		lastBalanceUpdate: hookData.lastBalanceUpdate
-	}
-}
+// 	useEffect(() => {
+// 		if (data?.result) {
+// 			setState(data.result)
+// 		}
+// 	}, [data])
+// 	return {
+// 		balance: hookData.balance,
+// 		lastBalanceUpdate: hookData.lastBalanceUpdate
+// 	}
+// }
diff --git a/views/homepage/MarketStatistics.tsx b/views/homepage/MarketStatistics.tsx
@@ -63,7 +63,7 @@ const MarketStatistics = ({ classes, commonStatsData, estimateCountedData }: Pro
 					content={numeral(estimateCountedData?.wallet_addresses).format('0,0')}
 					contentClasses="money-2sm"
 					icon={Icon.Wallet}
-					title="Wallet Addresses"
+					title="Addresses"
 				/>
 			</div>
 		</div>