Use eth Address to fetch acre points data

dapp/src/hooks/useAcrePoints.ts

@@ -15,12 +15,12 @@ type UseAcrePointsReturnType = {
 }
 
 export default function useAcrePoints(): UseAcrePointsReturnType {
- const { address = "" } = useWallet()
+ const { address = "", ethAddress = "" } = useWallet()
 
  const userPointsDataQuery = useQuery({
- queryKey: [...userKeys.pointsData(), address],
- enabled: !!address,
- queryFn: async () => acreApi.getPointsDataByUser(address),
+ queryKey: [...userKeys.pointsData(), ethAddress],
+ enabled: !!ethAddress,
+ queryFn: async () => acreApi.getPointsDataByUser(ethAddress),
  })
 
  const pointsDataQuery = useQuery({
@@ -37,7 +37,7 @@ export default function useAcrePoints(): UseAcrePointsReturnType {
 
  const { data } = userPointsDataQuery
  const totalBalance = bigIntToUserAmount(data?.claimed ?? 0n, 0)
- const claimableBalance = bigIntToUserAmount(data?.claimed ?? 0n, 0)
+ const claimableBalance = bigIntToUserAmount(data?.unclaimed ?? 0n, 0)
 
  return {
  totalBalance,

dapp/src/hooks/useWallet.ts

@@ -18,6 +18,7 @@ const { typeConversionToConnector, typeConversionToOrangeKitConnector } =
 type UseWalletReturn = {
  isConnected: boolean
  address?: string
+ ethAddress?: string
  balance?: bigint
  status: Status
  onConnect: (
@@ -41,6 +42,7 @@ export function useWallet(): UseWalletReturn {
  const resetWalletState = useResetWalletState()
 
  const [address, setAddress] = useState<string | undefined>(undefined)
+ const [ethAddress, setEthAddress] = useState<string | undefined>(undefined)
 
  // `isConnected` is variable derived from `status` but does not guarantee us a set `address`.
  // When `status` is 'connected' properties like `address` are guaranteed to be defined.
@@ -89,10 +91,13 @@ export function useWallet(): UseWalletReturn {
  const fetchBitcoinAddress = async () => {
  if (connector) {
  const btcAddress = await connector.getBitcoinAddress()
+ const accounts = await connector.getAccounts()
 
  setAddress(btcAddress)
+ setEthAddress(accounts[0])
  } else {
  setAddress(undefined)
+ setEthAddress(undefined)
  }
  }
 
@@ -103,11 +108,20 @@ export function useWallet(): UseWalletReturn {
  () => ({
  isConnected,
  address,
+ ethAddress,
  balance,
  status,
  onConnect,
  onDisconnect,
  }),
- [address, balance, isConnected, onConnect, onDisconnect, status],
+ [
+ address,
+ balance,
+ ethAddress,
+ isConnected,
+ onConnect,
+ onDisconnect,
+ status,
+ ],
  )
 }