Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: apply token metadata to transaction history #630

Merged
merged 1 commit into from
Nov 7, 2024
Merged

fix: apply token metadata to transaction history #630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions packages/adena-extension/src/hooks/use-make-transactions-with-time.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,20 @@ export const useMakeTransactionsWithTime = (
): UseMakeTransactionsWithTimeReturn => {
const { currentNetwork } = useNetwork();
const { transactionHistoryService } = useAdenaContext();
const { allTokenMetainfos, getTokenImageByDenom, getTokenAmount } = useTokenMetainfo();
const { allTokenMetainfos, tokenLogoMap, getTokenAmount } = useTokenMetainfo();
const { isFetched: isFetchedTokens } = useGRC20Tokens();
const { data: grc721Collections = [], isFetched: isFetchedGRC721Collections } =
useGetAllGRC721Collections();

const queryClient = useQueryClient();

const { status, isLoading, isFetched, isFetching, data } = useQuery({
queryKey: ['useMakeTransactionsWithTime', currentNetwork.chainId, key || ''],
queryKey: [
'useMakeTransactionsWithTime',
currentNetwork.chainId,
Object.values(tokenLogoMap).length,
key || '',
],
queryFn: () => {
if (!transactions || !grc721Collections) {
return null;
Expand Down Expand Up @@ -73,7 +78,7 @@ export const useMakeTransactionsWithTime = (
denom: 'GNOT',
},
),
logo: getTokenImageByDenom(transaction.logo) || '',
logo: tokenLogoMap?.[transaction.amount.denom] || '',
date: time || '',
};
}),
Expand All @@ -90,7 +95,8 @@ export const useMakeTransactionsWithTime = (
!!transactions &&
isFetchedTokens &&
isFetchedGRC721Collections &&
allTokenMetainfos.length > 0,
!!allTokenMetainfos &&
tokenLogoMap !== null,
keepPreviousData: true,
});

Expand Down
58 changes: 39 additions & 19 deletions packages/adena-extension/src/hooks/use-token-metainfo.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import { useCurrentAccount } from './use-current-account';
import { useNetwork } from './use-network';

import { TokenState } from '@states';
import { useQuery } from '@tanstack/react-query';
import { GRC20TokenModel, TokenModel } from '@types';
import { Account } from 'adena-module';
import BigNumber from 'bignumber.js';
Expand All @@ -25,7 +26,7 @@ interface GRC20Token {

export type UseTokenMetainfoReturn = {
tokenMetainfos: TokenModel[];
allTokenMetainfos: TokenModel[];
allTokenMetainfos: TokenModel[] | null;
currentTokenMetainfos: TokenModel[];
tokenLogoMap: Record<string, string | null>;
getTokenAmount: (amount: { value: string; denom: string }) => { value: string; denom: string };
Expand Down Expand Up @@ -77,20 +78,30 @@ export const useTokenMetainfo = (): UseTokenMetainfoReturn => {
const { addCollections } = useNFTCollectionHandler();
const { data: grc20Tokens } = useGRC20Tokens();

const allTokenMetainfos = useMemo(() => {
if (!grc20Tokens || tokenMetainfos.length === 0) {
return tokenMetainfos;
}

const remainTokens = grc20Tokens.filter(
(token) =>
!!token &&
tokenMetainfos.findIndex(
(meta) => isGRC20TokenModel(meta) && meta?.pkgPath !== token?.pkgPath,
),
);
return [...tokenMetainfos, ...remainTokens];
}, [tokenMetainfos, grc20Tokens]);
const { data: allTokenMetainfos = null } = useQuery<TokenModel[]>(
[
'useTokenMetainfo/allTokenMetainfos',
grc20Tokens?.map((token) => token.pkgPath),
currentNetwork.networkId,
],
async (): Promise<TokenModel[]> => {
const fetchedTokenMetainfos = await tokenService.fetchTokenMetainfos();
const remainGRC20Tokens = grc20Tokens
? grc20Tokens.filter(
(token) =>
!fetchedTokenMetainfos.find(
(meta) => isGRC20TokenModel(meta) && meta?.pkgPath === token?.pkgPath,
),
)
: [];

return [...fetchedTokenMetainfos, ...remainGRC20Tokens];
},
{
staleTime: Infinity,
enabled: !!grc20Tokens,
},
);

const currentTokenMetainfos = useMemo(() => {
return tokenMetainfos.filter(
Expand All @@ -99,6 +110,10 @@ export const useTokenMetainfo = (): UseTokenMetainfoReturn => {
}, [tokenMetainfos, currentNetwork]);

const tokenMetaMap = useMemo(() => {
if (!allTokenMetainfos) {
return {};
}

return allTokenMetainfos.reduce<{ [key in string]: TokenModel }>((acc, current) => {
if (isNativeTokenModel(current)) {
acc[current.denom] = current;
Expand All @@ -111,12 +126,16 @@ export const useTokenMetainfo = (): UseTokenMetainfoReturn => {
}, [allTokenMetainfos]);

const tokenLogoMap = useMemo(() => {
return currentTokenMetainfos.reduce<Record<string, string | null>>((accum, current) => {
if (!allTokenMetainfos) {
return {};
}

return allTokenMetainfos.reduce<Record<string, string | null>>((accum, current) => {
const key = makeTokenKey(current);
accum[key] = current.image || null;
return accum;
}, {});
}, [currentTokenMetainfos]);
}, [allTokenMetainfos]);

const initTokenMetainfos = async (withTransferEvents?: boolean): Promise<void> => {
if (!currentAccount || !currentNetwork.apiUrl) {
Expand Down Expand Up @@ -281,7 +300,7 @@ export const useTokenMetainfo = (): UseTokenMetainfoReturn => {
currentAccount.id,
);

const changedTokenMetainfos = tokenMetainfos
const newTokenMetainfos = tokenMetainfos
.filter(
(t1) =>
!currentTokenMetainfos.find(
Expand All @@ -296,7 +315,8 @@ export const useTokenMetainfo = (): UseTokenMetainfoReturn => {
}));

await tokenService.updateTokenMetainfosByAccountId(currentAccount.id, [
...changedTokenMetainfos,
...currentTokenMetainfos,
...newTokenMetainfos,
]);
return true;
};
Expand Down
2 changes: 1 addition & 1 deletion packages/adena-extension/src/hooks/wallet/token-details/use-token-transactions-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ export const useTokenTransactionsPage = (
}, [allTransactions]);

const { data, isFetched, status, isLoading, isFetching } = useMakeTransactionsWithTime(
`token-details/page/history/${currentNetwork.chainId}/${transactions?.length}/${tokenPath}`,
`token-details/page/history/${currentNetwork.chainId}/${transactions?.[0].hash}/${tokenPath}`,
transactions,
);

Expand Down
4 changes: 2 additions & 2 deletions ...ages/adena-extension/src/hooks/wallet/transaction-history/use-transaction-history-page.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,10 @@ export const useTransactionHistoryPage = ({
return allTransactions.pages.flatMap(
(page: unknown) => (page as TransactionWithPageInfo).transactions,
);
}, [allTransactions]);
}, [allTransactions?.pages]);

const { data, isFetched, status, isLoading, isFetching } = useMakeTransactionsWithTime(
`history/page/all/${currentNetwork.chainId}/${transactions?.length || 0}`,
`history/page/all/${currentNetwork.chainId}/${transactions?.[0].hash}`,
transactions,
);

Expand Down
2 changes: 1 addition & 1 deletion packages/adena-extension/src/hooks/wallet/transaction-history/use-transaction-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const useTransactionHistory = ({
}, [allTransactions, blockIndex]);

const { data, isFetched, status, isLoading, isFetching } = useMakeTransactionsWithTime(
`history/common/all/${currentNetwork.chainId}/${transactions?.length}`,
`history/common/all/${currentNetwork.chainId}/${transactions?.[0].hash}`,
transactions,
);

Expand Down
Loading