diff --git a/src/api/activity.api.ts b/src/api/activity.api.ts index af9d059..5a7aa3c 100644 --- a/src/api/activity.api.ts +++ b/src/api/activity.api.ts @@ -5,7 +5,7 @@ import config from '@app/config/config'; export interface WalletTransaction { id: number; - address: string; + witness_tx_id: string; date: number; output: string; value: string; @@ -28,7 +28,7 @@ export const getUserActivities = (): Promise => { // eslint-disable-next-line return data.map((item: any) => ({ id: item.ID, - address: item.Address, + witness_tx_id: item.WitnessTxId, date: new Date(item.Date).getTime(), output: item.Output, value: item.Value, diff --git a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx index 6f60bcc..280ac0b 100644 --- a/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx +++ b/src/components/nft-dashboard/activityStory/ActivityStoryItem/ActivityStoryItem.tsx @@ -8,7 +8,7 @@ import * as S from './ActivityStoryItem.styles'; import { BaseRow } from '@app/components/common/BaseRow/BaseRow'; import { BaseCol } from '@app/components/common/BaseCol/BaseCol'; -export const ActivityStoryItem: React.FC = ({ address, date, output, value }) => { +export const ActivityStoryItem: React.FC = ({ witness_tx_id, date, output, value }) => { const { t } = useTranslation(); // Convert value to number @@ -18,8 +18,8 @@ export const ActivityStoryItem: React.FC = ({ address, date, - {t('Address')}: - {address} + {t('Witness Transaction ID')}: + {witness_tx_id} {t('Output')}: diff --git a/src/hooks/useBalanceData.ts b/src/hooks/useBalanceData.ts index 85d0e9a..bfd8cc9 100644 --- a/src/hooks/useBalanceData.ts +++ b/src/hooks/useBalanceData.ts @@ -3,7 +3,7 @@ import config from '@app/config/config'; interface Transaction { id: number; - address: string; + witness_tx_id: string; date: string; output: string; value: number; @@ -32,12 +32,13 @@ const useBalanceData = () => { setBalanceData(balanceData); // Fetch transaction data - const transactionsResponse = await fetch('http://localhost:5000/transactions/latest'); + const transactionsResponse = await fetch(`${config.baseURL}/transactions/latest`); if (!transactionsResponse.ok) { throw new Error(`Network response was not ok (status: ${transactionsResponse.status})`); } const transactionsData: Transaction[] = await transactionsResponse.json(); setTransactions(transactionsData); + console.log('Transactions data:', transactionsData); } catch (error) { console.error('Error fetching data:', error); } finally {