RanchiMall/stellarwallet
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Improve transaction pagination logic by fetching an extra item to detect more pages, refining totalPages calculation, and updating currency display to XLM.

Browse Source
This commit is contained in:
void-57 2025-12-17 05:13:12 +05:30
parent 11f16d5ce9
commit 354e5bbb6e
1 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
index.html
View File

@ -1016,7 +1016,7 @@
balance = accountInfo.balanceXlm; balance = accountInfo.balanceXlm;
const balanceEl = document.getElementById('xlm-balance'); const balanceEl = document.getElementById('xlm-balance');
balanceEl.innerHTML = balance.toFixed(6) + ' <span class="currency">xlm</span>'; balanceEl.innerHTML = balance.toFixed(6) + ' <span class="currency">XLM</span>';
txNextToken = null; txNextToken = null;
await loadTransactions(true); await loadTransactions(true);
@ -1026,7 +1026,7 @@
// Show 0 balance for inactive accounts // Show 0 balance for inactive accounts
const balanceEl = document.getElementById('xlm-balance'); const balanceEl = document.getElementById('xlm-balance');
balanceEl.innerHTML = '0 <span class="currency">xlm</span>'; balanceEl.innerHTML = '0 <span class="currency">XLM</span>';
document.getElementById('tx-history').innerHTML = '<div class="tx-empty">Account is inactive or not funded yet</div>'; document.getElementById('tx-history').innerHTML = '<div class="tx-empty">Account is inactive or not funded yet</div>';
} }
@ -1203,19 +1203,36 @@
hasMoreTransactions = true; hasMoreTransactions = true;
} }
// Load only one batch of transactions // Load transactions - fetch one extra to check if there's more
if (hasMoreTransactions) { if (hasMoreTransactions) {
// Fetch ITEMS_PER_PAGE + 1 to check if there's a next page
const result = await xlmAPI.getTransactions(currentxlmAddress, { const result = await xlmAPI.getTransactions(currentxlmAddress, {
limit: 10, limit: ITEMS_PER_PAGE + 1,
next: txNextToken next: txNextToken
}); });
allTransactions = [...allTransactions, ...result.transactions]; // Check if we got more than ITEMS_PER_PAGE transactions
txNextToken = result.nextToken; const fetchedTransactions = result.transactions || [];
hasMoreTransactions = result.hasMore;
if (fetchedTransactions.length > ITEMS_PER_PAGE) {
allTransactions = [...allTransactions, ...fetchedTransactions.slice(0, ITEMS_PER_PAGE)];
hasMoreTransactions = true;
txNextToken = result.nextToken;
} else {
allTransactions = [...allTransactions, ...fetchedTransactions];
hasMoreTransactions = false;
txNextToken = null;
}
} }
totalPages = Math.ceil(allTransactions.length / ITEMS_PER_PAGE); // If we have no transactions at all
if (allTransactions.length === 0) {
hasMoreTransactions = false;
}
totalPages = Math.ceil(allTransactions.length / ITEMS_PER_PAGE) || 1;
if (hasMoreTransactions) { if (hasMoreTransactions) {
totalPages++; // Add one more page to show "next" is available totalPages++; // Add one more page to show "next" is available
} }
@ -1267,8 +1284,9 @@
// Update button states // Update button states
document.getElementById('prev-page-btn').disabled = currentPage <= 1; document.getElementById('prev-page-btn').disabled = currentPage <= 1;
// Enable next button if we're not on last page OR if there are more transactions to load // Disable next button if we're on the last page AND there are no more transactions to load
document.getElementById('next-page-btn').disabled = currentPage >= totalPages && !hasMoreTransactions; const isLastPage = currentPage >= totalPages;
document.getElementById('next-page-btn').disabled = isLastPage && !hasMoreTransactions;
paginationEl.style.display = filteredTransactions.length > 0 ? 'flex' : 'none'; paginationEl.style.display = filteredTransactions.length > 0 ? 'flex' : 'none';
} }