Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions src/hooks/useInitReefStateExtension.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import {
reefState,
network as nw,
extension as extReef,
ReefAccount,
} from "@reef-chain/util-lib";
import { useEffect, useState } from "react";
import { Provider } from "@reef-chain/evm-provider";
Expand Down Expand Up @@ -105,6 +106,9 @@ export const useInitReefStateExtension = (
let selectedAddress: string | undefined = useObservableState(
reefState.selectedAddress$
);
let accounts: ReefAccount[] | null | undefined = useObservableState(
reefState.accounts$
);

useEffect(() => {
setError(errExtension);
Expand Down Expand Up @@ -164,7 +168,21 @@ export const useInitReefStateExtension = (
)
);
const allAccs = await Promise.all(accountPromises);
setAllAccounts(allAccs);
let updatedBalanceAccounts:ReefSigner[] = [];
let updatedBalancesMap = {};

if(accounts){
accounts.forEach((acc)=>updatedBalancesMap[acc.address]=acc.balance);
}

allAccs.forEach((acc)=>{
updatedBalanceAccounts.push({
balance: updatedBalancesMap[acc.address]??acc.balance,
...acc
})
})

setAllAccounts(updatedBalanceAccounts);

const storedAddress = getSelectedAddress();
if (selectedAddress === undefined && storedAddress !== undefined)
Expand All @@ -184,7 +202,7 @@ export const useInitReefStateExtension = (
setSelectedReefSigner(undefined);
setIsSignersLoading(false);
}
}, [extensionWithAccounts, provider, selectedAddress, initNetwork, extensionWithAccounts]);
}, [provider, selectedAddress, initNetwork,extensionWithAccounts,accounts]);

return {
error,
Expand Down