From 446efae92041901628f2d3fe21c003798e491d51 Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Thu, 9 Jan 2025 15:28:17 +0000 Subject: [PATCH 1/7] new symbol --- .../src/components/bridge/bridge/ActionButton.tsx | 10 +++++----- .../components/bridge/bridge/TransactionSummary.tsx | 3 ++- .../src/components/bridge/history/HistoryDesktop.tsx | 1 + .../world-builder-dashboard/src/utils/web3utils.ts | 12 +++++++++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/bridge/ActionButton.tsx b/webapps/world-builder-dashboard/src/components/bridge/bridge/ActionButton.tsx index f680478d..6ab76fa8 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/bridge/ActionButton.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/bridge/ActionButton.tsx @@ -12,7 +12,7 @@ import { Bridger, BridgeTransferStatus } from 'game7-bridge-sdk' import { useBlockchainContext } from '@/contexts/BlockchainContext' import { useBridgeNotificationsContext } from '@/contexts/BridgeNotificationsContext' import { getTokensForNetwork, Token } from '@/utils/tokens' -import { ZERO_ADDRESS } from '@/utils/web3utils' +import { returnSymbol, ZERO_ADDRESS } from '@/utils/web3utils' import { MultiTokenApproval } from './MultiTokenApproval' interface ActionButtonProps { @@ -72,7 +72,7 @@ const ActionButton: React.FC = ({ setShowApproval(true) return false } - + const amountBN = ethers.utils.parseUnits(amount, decimals) if (bridgeAllowance === null) { const gasFeesAmount = gasFees?.[1] ? ethers.utils.parseUnits(gasFees[1], 18) : amountBN @@ -164,7 +164,7 @@ const ActionButton: React.FC = ({ lowNetworkTimestamp: Date.now() / 1000, completionTimestamp: Date.now() / 1000, newTransaction: true, - symbol: symbol, + symbol: returnSymbol(direction, selectedHighNetwork, selectedLowNetwork, symbol ?? ''), status: destinationTokenAddress === ZERO_ADDRESS ? BridgeTransferStatus.DEPOSIT_GAS_PENDING @@ -185,7 +185,7 @@ const ActionButton: React.FC = ({ highNetworkHash: tx?.hash, highNetworkTimestamp: Date.now() / 1000, challengePeriod: selectedNetworkType === 'Testnet' ? 60 * 60 : 60 * 60 * 24 * 7, - symbol: symbol, + symbol: returnSymbol(direction, selectedHighNetwork, selectedLowNetwork, symbol ?? ''), status: isCCTP ? BridgeTransferStatus.CCTP_PENDING @@ -241,7 +241,7 @@ const ActionButton: React.FC = ({ token.symbol === selectedHighNetwork.nativeCurrency?.symbol : token.symbol === selectedLowNetwork.nativeCurrency?.symbol ) - + if (bridgeAllowance === null && nativeAllowance !== null) { return [nativeToken].filter((token): token is Token => token !== undefined) } diff --git a/webapps/world-builder-dashboard/src/components/bridge/bridge/TransactionSummary.tsx b/webapps/world-builder-dashboard/src/components/bridge/bridge/TransactionSummary.tsx index 1cbbd37c..a34ce031 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/bridge/TransactionSummary.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/bridge/TransactionSummary.tsx @@ -4,6 +4,7 @@ import { Tooltip, useClipboard } from 'summon-ui/mantine' import { mantineBreakpoints } from '@/styles/breakpoints' import { useMediaQuery } from '@mantine/hooks' import { NetworkInterface } from '@/contexts/BlockchainContext' +import { returnSymbol } from '@/utils/web3utils' const formatCurrency = (value: number) => { const formatter = new Intl.NumberFormat('en-US', { @@ -177,7 +178,7 @@ const TransactionSummary: React.FC = ({
You will receive
- {`${value} ${tokenSymbol.startsWith('USDC') ? (tokenSymbol === 'USDC.e' ? 'USDC' : 'USDC.e') : tokenSymbol}`} + {`${value} ${returnSymbol(direction, selectedHighChain, selectedLowChain, tokenSymbol)}`}
{tokenRate > 0 &&
{formatCurrency(value * (tokenSymbol === 'ETH' || tokenSymbol === 'G7' || tokenSymbol === 'TG7T' ? ethRate : tokenRate))}
}
diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index 97c96ecb..c77576d6 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -70,6 +70,7 @@ const HistoryDesktop: React.FC = () => { const { data: messages } = useMessages(connectedAccount, selectedNetworkType || 'Testnet') const { useHistoryTransactions } = useBridgeAPI() const { data: apiTransactions } = useHistoryTransactions(connectedAccount) + console.log(apiTransactions) const [mergedTransactions, setMergedTransactions] = useState([]) const headers = ['Type', 'Submitted', 'Token', 'From', 'To', 'Transaction', 'Status', ''] diff --git a/webapps/world-builder-dashboard/src/utils/web3utils.ts b/webapps/world-builder-dashboard/src/utils/web3utils.ts index 80b6e86d..5cc38a0e 100644 --- a/webapps/world-builder-dashboard/src/utils/web3utils.ts +++ b/webapps/world-builder-dashboard/src/utils/web3utils.ts @@ -1,6 +1,6 @@ import { getHighNetworks, getLowNetworks, HIGH_NETWORKS, LOW_NETWORKS } from '../../constants' import { ethers } from 'ethers' -import { NetworkType } from '@/contexts/BlockchainContext' +import { NetworkInterface, NetworkType } from '@/contexts/BlockchainContext' import { providers } from 'ethers' export const convertToBigNumber = (numberString: string, precision = 18) => { @@ -92,4 +92,14 @@ export const fetchTransactionTimestamp = async (completionTxHash: string, rpcUrl export const getCachedTransactions = (connectedAccount: string, selectedNetworkType: NetworkType) => { const transactionsString = localStorage.getItem(`bridge-${connectedAccount}-transactions-${selectedNetworkType}`) return transactionsString ? JSON.parse(transactionsString) : [] +} + +export const returnSymbol = (direction: 'DEPOSIT' | 'WITHDRAW', selectedHighChain: NetworkInterface, selectedLowChain: NetworkInterface, tokenSymbol: string) => { + if (tokenSymbol.startsWith('USDC')) { + if (direction === 'DEPOSIT' && (selectedHighChain.chainId === 13746 || selectedHighChain.chainId === 2187)) + return 'USDC.e' + else if (direction === 'WITHDRAW' && (selectedLowChain.chainId === 421614 || selectedLowChain.chainId === 42161)) + return 'USDC' + } + return tokenSymbol } \ No newline at end of file From b4cc72f865ddf533e45f43701f00ec11ec30f230 Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Thu, 9 Jan 2025 18:49:25 +0000 Subject: [PATCH 2/7] non-null coingecko --- .../src/components/bridge/bridge/BridgeView.tsx | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx index a14c4610..9e706870 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx @@ -74,7 +74,7 @@ const BridgeView = ({ token: nativeToken }) - const { data: coinUSDRate, isFetching: isCoinFetching } = useUSDPriceOfToken(selectedBridgeToken.geckoId ?? '') + const { data: coinUSDRate, isFetching: isCoinFetching } = useUSDPriceOfToken(selectedBridgeToken?.geckoId ?? '') const { data: ethRate } = useUSDPriceOfToken('ethereum') const handleTokenChange = async (token: Token) => { setSelectedBridgeToken(token) @@ -213,7 +213,7 @@ const BridgeView = ({ onTokenChange={handleTokenChange} balance={tokenInformation?.tokenBalance} rate={ - selectedBridgeToken.symbol === 'TG7T' || selectedBridgeToken.symbol === 'G7' + selectedBridgeToken?.symbol === 'TG7T' || selectedBridgeToken?.symbol === 'G7' ? 1 : isCoinFetching ? 0.0 @@ -259,11 +259,13 @@ const BridgeView = ({ value={Number(value)} ethRate={ethRate?.ethereum?.usd ?? 0} tokenRate={ - selectedBridgeToken.symbol === 'TG7T' || selectedBridgeToken.symbol === 'G7' + selectedBridgeToken?.symbol === 'TG7T' || selectedBridgeToken?.symbol === 'G7' ? 1 : isCoinFetching ? 0.0 - : coinUSDRate[selectedBridgeToken?.geckoId ?? ''].usd ?? 0 + : coinUSDRate[selectedBridgeToken?.geckoId ?? ''] + ? coinUSDRate[selectedBridgeToken?.geckoId ?? ''].usd + : 0 } tokenSymbol={tokenInformation?.symbol ?? ''} gasNativeTokenSymbol={ From 646d11ed831aacfd4f7f16ef79e9837df8fd06d1 Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Thu, 9 Jan 2025 19:14:24 +0000 Subject: [PATCH 3/7] show 10 items at once --- .../bridge/history/HistoryDesktop.tsx | 46 +++++++++++++++---- 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index c77576d6..edd5d940 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -1,5 +1,5 @@ // External Libraries -import React, { Fragment, useEffect, useState } from 'react' +import React, { Fragment, useEffect, useState, useRef } from 'react' // Styles import styles from './WithdrawTransactions.module.css' import { ethers } from 'ethers' @@ -15,7 +15,6 @@ interface HistoryDesktopProps { } const mergeTransactions = (apiData: TransactionRecord[], localData: TransactionRecord[]): TransactionRecord[] => { const combinedData = new Map() - localData.forEach((localTx) => { const hashKey = localTx.type === 'DEPOSIT' ? (localTx.lowNetworkHash ?? '') : (localTx.highNetworkHash ?? '') combinedData.set(hashKey, localTx) @@ -39,8 +38,8 @@ const mergeTransactions = (apiData: TransactionRecord[], localData: TransactionR combinedData.set(hashKey, apiTx) } }) - const combinedDataArray = Array.from(combinedData.values()) + console.log(combinedDataArray) return combinedDataArray } @@ -70,16 +69,16 @@ const HistoryDesktop: React.FC = () => { const { data: messages } = useMessages(connectedAccount, selectedNetworkType || 'Testnet') const { useHistoryTransactions } = useBridgeAPI() const { data: apiTransactions } = useHistoryTransactions(connectedAccount) - console.log(apiTransactions) const [mergedTransactions, setMergedTransactions] = useState([]) + const [visibleTransactions, setVisibleTransactions] = useState([]) const headers = ['Type', 'Submitted', 'Token', 'From', 'To', 'Transaction', 'Status', ''] + const bottomRef = useRef(null) // Merge transations only when API data is updated with new data useEffect(() => { const localTransactions = messages || [] const formattedApiTransactions = apiTransactions ? apiTransactions.map(apiDataToTransactionRecord) : [] const combinedTransactions = mergeTransactions(formattedApiTransactions, localTransactions) - console.log(formattedApiTransactions) // Check if the combined transactions are different from those in localStorage if ( combinedTransactions.length !== localTransactions.length || @@ -105,20 +104,47 @@ const HistoryDesktop: React.FC = () => { ) } setMergedTransactions(combinedTransactions) + setVisibleTransactions(combinedTransactions.slice(0, 10)) }, [messages, apiTransactions]) + const loadMoreItems = () => { + setVisibleTransactions((prev) => { + const nextItems = mergedTransactions.slice(prev.length, prev.length + 5) + return [...prev, ...nextItems] + }) + } + + // Add scroll event listener + useEffect(() => { + const handleScroll = () => { + console.log('hello shmello') + const bottom = window.innerHeight + window.scrollY + console.log('Scroll position:', window.scrollY, 'Bottom position:', bottom) + + if (bottomRef.current) { + const progress = window.scrollY / (5000 - window.innerHeight) + console.log(progress) + // loadMoreItems() + } + } + window.addEventListener('scroll', handleScroll); + return () => { + window.removeEventListener('scroll', handleScroll); + } + }, []) + return (
- {mergedTransactions && ( + {visibleTransactions && (
-
+
{headers.map((h) => (
{h}
))} - {mergedTransactions + {visibleTransactions .sort((x: TransactionRecord, y: TransactionRecord) => { const xTimestamp = x.type === 'DEPOSIT' ? x.lowNetworkTimestamp : x.highNetworkTimestamp const yTimestamp = y.type === 'DEPOSIT' ? y.lowNetworkTimestamp : y.highNetworkTimestamp @@ -132,9 +158,9 @@ const HistoryDesktop: React.FC = () => { {tx.lowNetworkHash && } ) )} - {mergedTransactions.filter((tx: TransactionRecord) => tx.type === 'DEPOSIT' || tx.type === 'WITHDRAWAL') - .length === 0 &&
No transactions yet
} + {visibleTransactions.filter((tx: TransactionRecord) => tx.type === 'DEPOSIT' || tx.type === 'WITHDRAWAL').length === 0 &&
No transactions yet
}
+
)}
From d80383770318cc0d5ba0e2d12ee4acf773d12456 Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Fri, 10 Jan 2025 12:10:55 +0000 Subject: [PATCH 4/7] corrected sorting --- .../src/components/bridge/bridge/BridgeView.tsx | 4 ++-- .../components/bridge/history/HistoryDesktop.tsx | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx index 9e706870..f996a46c 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/bridge/BridgeView.tsx @@ -263,8 +263,8 @@ const BridgeView = ({ ? 1 : isCoinFetching ? 0.0 - : coinUSDRate[selectedBridgeToken?.geckoId ?? ''] - ? coinUSDRate[selectedBridgeToken?.geckoId ?? ''].usd + : coinUSDRate && selectedBridgeToken?.geckoId && coinUSDRate[selectedBridgeToken.geckoId] + ? coinUSDRate[selectedBridgeToken.geckoId]?.usd ?? 0 : 0 } tokenSymbol={tokenInformation?.symbol ?? ''} diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index edd5d940..dce5fbe2 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -79,6 +79,7 @@ const HistoryDesktop: React.FC = () => { const localTransactions = messages || [] const formattedApiTransactions = apiTransactions ? apiTransactions.map(apiDataToTransactionRecord) : [] const combinedTransactions = mergeTransactions(formattedApiTransactions, localTransactions) + // Check if the combined transactions are different from those in localStorage if ( combinedTransactions.length !== localTransactions.length || @@ -104,6 +105,12 @@ const HistoryDesktop: React.FC = () => { ) } setMergedTransactions(combinedTransactions) + combinedTransactions.sort((x: TransactionRecord, y: TransactionRecord) => { + const xTimestamp = x.type === 'DEPOSIT' ? x.lowNetworkTimestamp : x.highNetworkTimestamp + const yTimestamp = y.type === 'DEPOSIT' ? y.lowNetworkTimestamp : y.highNetworkTimestamp + + return (yTimestamp ?? 0) - (xTimestamp ?? 0) + }) setVisibleTransactions(combinedTransactions.slice(0, 10)) }, [messages, apiTransactions]) @@ -117,14 +124,13 @@ const HistoryDesktop: React.FC = () => { // Add scroll event listener useEffect(() => { const handleScroll = () => { - console.log('hello shmello') const bottom = window.innerHeight + window.scrollY console.log('Scroll position:', window.scrollY, 'Bottom position:', bottom) if (bottomRef.current) { const progress = window.scrollY / (5000 - window.innerHeight) console.log(progress) - // loadMoreItems() + loadMoreItems() } } window.addEventListener('scroll', handleScroll); @@ -145,12 +151,6 @@ const HistoryDesktop: React.FC = () => {
))} {visibleTransactions - .sort((x: TransactionRecord, y: TransactionRecord) => { - const xTimestamp = x.type === 'DEPOSIT' ? x.lowNetworkTimestamp : x.highNetworkTimestamp - const yTimestamp = y.type === 'DEPOSIT' ? y.lowNetworkTimestamp : y.highNetworkTimestamp - - return (yTimestamp ?? 0) - (xTimestamp ?? 0) - }) .map((tx: TransactionRecord, idx: number) => tx.type === 'WITHDRAWAL' ? ( From 0c9c823596e3ffafd18e9fc097d8c91e414907ae Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Fri, 10 Jan 2025 12:27:33 +0000 Subject: [PATCH 5/7] added infinite scroll --- .../bridge/history/HistoryDesktop.tsx | 36 +++++++++++-------- .../history/WithdrawTransactions.module.css | 4 +-- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index dce5fbe2..c2f82775 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -69,10 +69,11 @@ const HistoryDesktop: React.FC = () => { const { data: messages } = useMessages(connectedAccount, selectedNetworkType || 'Testnet') const { useHistoryTransactions } = useBridgeAPI() const { data: apiTransactions } = useHistoryTransactions(connectedAccount) - const [mergedTransactions, setMergedTransactions] = useState([]) const [visibleTransactions, setVisibleTransactions] = useState([]) + const [mergedTransactions, setMergedTransactions] = useState([]) const headers = ['Type', 'Submitted', 'Token', 'From', 'To', 'Transaction', 'Status', ''] const bottomRef = useRef(null) + const transactionsRef = useRef(null) // Merge transations only when API data is updated with new data useEffect(() => { @@ -104,47 +105,54 @@ const HistoryDesktop: React.FC = () => { JSON.stringify([...localTransactions, ...newTransactions]) ) } - setMergedTransactions(combinedTransactions) + // sort first combinedTransactions.sort((x: TransactionRecord, y: TransactionRecord) => { const xTimestamp = x.type === 'DEPOSIT' ? x.lowNetworkTimestamp : x.highNetworkTimestamp const yTimestamp = y.type === 'DEPOSIT' ? y.lowNetworkTimestamp : y.highNetworkTimestamp return (yTimestamp ?? 0) - (xTimestamp ?? 0) }) + setMergedTransactions(combinedTransactions) setVisibleTransactions(combinedTransactions.slice(0, 10)) }, [messages, apiTransactions]) const loadMoreItems = () => { + console.log('....loadig?!') setVisibleTransactions((prev) => { const nextItems = mergedTransactions.slice(prev.length, prev.length + 5) + console.log(nextItems) return [...prev, ...nextItems] }) } - // Add scroll event listener useEffect(() => { const handleScroll = () => { - const bottom = window.innerHeight + window.scrollY - console.log('Scroll position:', window.scrollY, 'Bottom position:', bottom) - - if (bottomRef.current) { - const progress = window.scrollY / (5000 - window.innerHeight) - console.log(progress) - loadMoreItems() + if (transactionsRef.current) { + const { scrollTop, scrollHeight, clientHeight } = transactionsRef.current + if (scrollTop + clientHeight >= scrollHeight - 10) { + loadMoreItems() + } } } - window.addEventListener('scroll', handleScroll); + + const currentRef = transactionsRef.current + if (currentRef) { + currentRef.addEventListener('scroll', handleScroll) + } + return () => { - window.removeEventListener('scroll', handleScroll); + if (currentRef) { + currentRef.removeEventListener('scroll', handleScroll) + } } - }, []) + }, [visibleTransactions]) return (
{visibleTransactions && (
-
+
{headers.map((h) => (
{h} diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/WithdrawTransactions.module.css b/webapps/world-builder-dashboard/src/components/bridge/history/WithdrawTransactions.module.css index 28b2c9ef..fe662a4a 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/WithdrawTransactions.module.css +++ b/webapps/world-builder-dashboard/src/components/bridge/history/WithdrawTransactions.module.css @@ -23,7 +23,7 @@ box-shadow: 0 1px 3px 0 rgba(16, 24, 40, 0.1), 0 1px 2px 0 rgba(16, 24, 40, 0.06); - overflow-y: auto; + overflow-y: scroll; flex-grow: 0; } @@ -96,7 +96,7 @@ grid-template-columns: repeat(8, auto); width: 100%; max-width: 1096px; - overflow-y: auto; + overflow-y: scroll; max-height: calc(100vh - 282px); } From 9d793581d2dc0c734e3b3ebafe4dd7db9e57cadc Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Fri, 10 Jan 2025 12:32:46 +0000 Subject: [PATCH 6/7] remov ebottm ref and log --- .../src/components/bridge/history/HistoryDesktop.tsx | 3 --- 1 file changed, 3 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index c2f82775..9f9fb0fe 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -72,7 +72,6 @@ const HistoryDesktop: React.FC = () => { const [visibleTransactions, setVisibleTransactions] = useState([]) const [mergedTransactions, setMergedTransactions] = useState([]) const headers = ['Type', 'Submitted', 'Token', 'From', 'To', 'Transaction', 'Status', ''] - const bottomRef = useRef(null) const transactionsRef = useRef(null) // Merge transations only when API data is updated with new data @@ -120,7 +119,6 @@ const HistoryDesktop: React.FC = () => { console.log('....loadig?!') setVisibleTransactions((prev) => { const nextItems = mergedTransactions.slice(prev.length, prev.length + 5) - console.log(nextItems) return [...prev, ...nextItems] }) } @@ -168,7 +166,6 @@ const HistoryDesktop: React.FC = () => { )} {visibleTransactions.filter((tx: TransactionRecord) => tx.type === 'DEPOSIT' || tx.type === 'WITHDRAWAL').length === 0 &&
No transactions yet
}
-
)}
From 023682ecfe2bef715aac987a1313e48924e40615 Mon Sep 17 00:00:00 2001 From: Memo Khoury Date: Fri, 10 Jan 2025 12:33:05 +0000 Subject: [PATCH 7/7] remov elog --- .../src/components/bridge/history/HistoryDesktop.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx index 9f9fb0fe..6782a6c8 100644 --- a/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx +++ b/webapps/world-builder-dashboard/src/components/bridge/history/HistoryDesktop.tsx @@ -39,7 +39,6 @@ const mergeTransactions = (apiData: TransactionRecord[], localData: TransactionR } }) const combinedDataArray = Array.from(combinedData.values()) - console.log(combinedDataArray) return combinedDataArray } @@ -116,7 +115,6 @@ const HistoryDesktop: React.FC = () => { }, [messages, apiTransactions]) const loadMoreItems = () => { - console.log('....loadig?!') setVisibleTransactions((prev) => { const nextItems = mergedTransactions.slice(prev.length, prev.length + 5) return [...prev, ...nextItems]