fix: fix issues in nft

onbloc · Nov 6, 2024 · 31bfd86 · 31bfd86
1 parent a2f7325
commit 31bfd86
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 16 deletions.
diff --git a/...src/components/pages/nft-collection/nft-collection-assets/nft-collection-assets.styles.ts b/...src/components/pages/nft-collection/nft-collection-assets/nft-collection-assets.styles.ts
@@ -11,7 +11,7 @@ export const NFTCollectionAssetsWrapper = styled.div`
 
   .description {
     position: absolute;
-    top: 210px;
+    top: 139px;
     left: 0px;
     width: 100%;
     text-align: center;

diff --git a/...ages/adena-extension/src/components/pages/nft/nft-collection-card/nft-collection-card.tsx b/...ages/adena-extension/src/components/pages/nft/nft-collection-card/nft-collection-card.tsx
@@ -40,7 +40,9 @@ const NFTCollectionCard: React.FC<NFTCollectionCardProps> = ({
     },
   );
 
-  const { data: balance } = queryGRC721Balance(grc721Collection.packagePath);
+  const { data: balance } = queryGRC721Balance(grc721Collection.packagePath, {
+    refetchOnMount: true,
+  });
 
   const isFetchedCardTokenUri = useMemo(() => {
     if (!grc721Collection.isTokenUri) {

diff --git a/packages/adena-extension/src/components/pages/nft/nft-collections/nft-collections.styles.ts b/packages/adena-extension/src/components/pages/nft/nft-collections/nft-collections.styles.ts
@@ -22,7 +22,7 @@ export const NFTCollectionsWrapper = styled.div`
 
   .description {
     position: absolute;
-    top: 210px;
+    top: 139px;
     left: 0px;
     width: 100%;
     text-align: center;

diff --git a/packages/adena-extension/src/pages/popup/wallet/history/index.tsx b/packages/adena-extension/src/pages/popup/wallet/history/index.tsx
@@ -3,14 +3,14 @@ import styled from 'styled-components';
 
 import { HISTORY_FETCH_INTERVAL_TIME } from '@common/constants/interval.constant';
 import { TransactionHistory } from '@components/molecules';
+import { useGetAllGRC721Collections } from '@hooks/nft/use-get-all-grc721-collections';
 import { useGetGRC721TokenUri } from '@hooks/nft/use-get-grc721-token-uri';
 import useAppNavigate from '@hooks/use-app-navigate';
 import { useCurrentAccount } from '@hooks/use-current-account';
 import { useNetwork } from '@hooks/use-network';
 import useScrollHistory from '@hooks/use-scroll-history';
 import { useTransactionHistory } from '@hooks/wallet/transaction-history/use-transaction-history';
 import { useTransactionHistoryPage } from '@hooks/wallet/transaction-history/use-transaction-history-page';
-import { TransactionHistoryMapper } from '@repositories/transaction/mapper/transaction-history-mapper';
 import mixins from '@styles/mixins';
 import { fonts } from '@styles/theme';
 import { RoutePath } from '@types';
@@ -40,6 +40,8 @@ const HistoryContainer: React.FC = () => {
   const { saveScrollPosition } = useScrollHistory(scrollRef);
   const { currentNetwork } = useNetwork();
 
+  useGetAllGRC721Collections({ refetchOnMount: true });
+
   const isUsedApi = useMemo(() => {
     return !!currentNetwork.apiUrl;
   }, [currentNetwork]);
@@ -64,7 +66,7 @@ const HistoryContainer: React.FC = () => {
   }, [loadingNextFetch, isLoading, isFetching, hasNextPage]);
 
   useEffect(() => {
-    if (document.getElementsByTagName('body').length > 0) {
+    if (document.getElementsByTagName('body') && document.getElementsByTagName('body').length > 0) {
       setBodyElement(document.getElementsByTagName('body')[0]);
     }
   }, [document.getElementsByTagName('body')]);
@@ -90,10 +92,7 @@ const HistoryContainer: React.FC = () => {
 
   const onClickItem = useCallback(
     (hash: string) => {
-      const transactions =
-        TransactionHistoryMapper.queryToDisplay(data || []).flatMap(
-          (group) => group.transactions,
-        ) ?? [];
+      const transactions = data?.flatMap((group) => group.transactions) ?? [];
       const transactionInfo = transactions.find((transaction) => transaction.hash === hash);
       if (transactionInfo) {
         saveScrollPosition(scrollRef.current?.scrollTop || 0);
@@ -112,7 +111,7 @@ const HistoryContainer: React.FC = () => {
       </StyledTitleWrapper>
       <TransactionHistory
         status={isSupported ? status : 'error'}
-        transactionInfoLists={data ? TransactionHistoryMapper.queryToDisplay(data) : []}
+        transactionInfoLists={data || []}
         queryGRC721TokenUri={useGetGRC721TokenUri}
         onClickItem={onClickItem}
       />

diff --git a/packages/adena-extension/src/pages/popup/wallet/token-details/index.tsx b/packages/adena-extension/src/pages/popup/wallet/token-details/index.tsx
@@ -10,7 +10,6 @@ import { DoubleButton, TransactionHistory } from '@components/molecules';
 import { useCurrentAccount } from '@hooks/use-current-account';
 import useHistoryData from '@hooks/use-history-data';
 import useScrollHistory from '@hooks/use-scroll-history';
-import { TransactionHistoryMapper } from '@repositories/transaction/mapper/transaction-history-mapper';
 import { getTheme } from '@styles/theme';
 import { RoutePath } from '@types';
 
@@ -143,7 +142,10 @@ export const TokenDetails = (): JSX.Element => {
   }, [currentBalances, tokenBalance]);
 
   const transactions = useMemo(() => {
-    return TransactionHistoryMapper.queryToDisplay(data || []);
+    if (!data) {
+      return [];
+    }
+    return data;
   }, [data]);
 
   const onScrollListener = (): void => {
@@ -158,10 +160,7 @@ export const TokenDetails = (): JSX.Element => {
 
   const onClickItem = useCallback(
     (hash: string) => {
-      const transactions =
-        TransactionHistoryMapper.queryToDisplay(data ?? []).flatMap(
-          (group) => group.transactions,
-        ) ?? [];
+      const transactions = data?.flatMap((group) => group.transactions) ?? [];
       const transactionInfo = transactions.find((transaction) => transaction.hash === hash);
       if (transactionInfo) {
         saveScrollPosition(scrollRef.current?.scrollTop || 0);