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

Jump to bottom

Implement load more txs #79

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Implement load more txs #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5f9ecaa
Implement load more txs
D2Phoenix Feb 3, 2022
169b08a
Fix issue on initial load
D2Phoenix Feb 3, 2022
87bcf0d
Fix txs set on update
D2Phoenix Feb 3, 2022
8fe0cbf
Zero length check
D2Phoenix Feb 3, 2022
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
38 changes: 33 additions & 5 deletions src/js/Controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ class Controller {
/** @type {WalletContract} */
this.walletContract = null;
this.transactions = [];
this.hasMoreTxs = true;
this.updateIntervalId = 0;
this.lastTransactionTime = 0;
this.isContractInitialized = false;
Expand Down Expand Up @@ -181,7 +182,11 @@ class Controller {
return new BN(getWalletResponse.balance);
}

async getTransactions(limit = 20) {
async getTransactions(loadMore = false, limit = 20) {

if (loadMore && !this.hasMoreTxs) {
return [];
}

function getComment(msg) {
if (!msg.msg_data) return '';
Expand All @@ -191,7 +196,20 @@ class Controller {
}

const arr = [];
const transactions = await this.ton.getTransactions(this.myAddress, limit);
let lt, hash;

if (loadMore) {
const lastTransaction = this.transactions[this.transactions.length - 1];
lt = lastTransaction.lt;
hash = this.ton.utils.bytesToHex(this.ton.utils.base64ToBytes(lastTransaction.hash));
}

const transactions = await this.ton.provider.getTransactions(this.myAddress, limit, lt, hash, undefined, loadMore);

if (loadMore && transactions.length < limit){
this.hasMoreTxs = false;
}

for (let t of transactions) {
let amount = new BN(t.in_msg.value);
for (let outMsg of t.out_msgs) {
Expand Down Expand Up @@ -224,7 +242,9 @@ class Controller {
storageFee: t.storage_fee.toString(),
otherFee: t.other_fee.toString(),
comment: comment,
date: t.utime * 1000
date: t.utime * 1000,
lt: t.transaction_id.lt,
hash: t.transaction_id.hash,
});
}
}
Expand Down Expand Up @@ -503,8 +523,8 @@ class Controller {
if (isBalanceChanged) {
this.getTransactions().then(txs => {
if (txs.length > 0) {
this.transactions = txs;
const newTxs = txs.filter(tx => Number(tx.date) > this.lastTransactionTime);
this.transactions = [...newTxs, ...this.transactions];
this.lastTransactionTime = Number(txs[0].date);

if (this.processingVisible && this.sendingData) {
Expand All @@ -527,7 +547,7 @@ class Controller {
}
}

this.sendToView('setBalance', {balance: balance.toString(), txs});
this.sendToView('setBalance', {balance: balance.toString(), txs: this.transactions});
});
} else {
this.sendToView('setBalance', {balance: balance.toString(), txs: this.transactions});
Expand Down Expand Up @@ -855,6 +875,14 @@ class Controller {
localStorage.setItem('proxy', params ? 'true' : 'false');
this.doProxy(params);
break;
case 'loadTransactions':
this.getTransactions(true).then((txs) => {
if (txs.length) {
this.transactions = [...this.transactions, ...txs];
this.sendToView('setTransactions', {txs: this.transactions});
}
})
break;
}
}

Expand Down
34 changes: 33 additions & 1 deletion src/js/view/View.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ class View {
this.currentScreenName = null;
/** @type {boolean} */
this.isTestnet = false;
/** @type {IntersectionObserver} */
this.txsListObserver = null;

this.createImportInputs();

Expand Down Expand Up @@ -559,7 +561,13 @@ class View {
}

setTransactions(txs) {
clearElement($('#transactionsList'));
const transactionsList = $('#transactionsList');

if (this.txsListObserver && transactionsList.lastElementChild) {
this.txsListObserver.unobserve(transactionsList.lastElementChild);
}

clearElement(transactionsList);
let date = '';

toggle($('#walletCreated'), txs.length === 0);
Expand All @@ -578,6 +586,7 @@ class View {
}
this.addTx(tx)
});
this.observeTransactionsList();
}

addDateSeparator(dateString) {
Expand Down Expand Up @@ -638,6 +647,25 @@ class View {
this.onMessage('showPopup', {name: 'send', toAddr: this.currentTransactionAddr});
}

observeTransactionsList() {
if (!this.txsListObserver) {
this.txsListObserver = new IntersectionObserver((entries) => {
const target = entries[0];
if (target.isIntersecting) {
this.sendMessage('loadTransactions');
}
}, {
root: $('#transactionsContainer'),
rootMargin: '0px',
threshold: 0.5,
});
}
const lastTxElement = $('#transactionsList').lastElementChild;
if (lastTxElement) {
this.txsListObserver.observe(lastTxElement);
}
}

// SEND POPUP

clearSend() {
Expand Down Expand Up @@ -759,6 +787,10 @@ class View {
this.setBalance(new BN(params.balance), params.txs);
break;

case 'setTransactions':
this.setTransactions(params.txs);
break;

case 'setIsLedger':
this.isLedger = params;
break;
Expand Down
4 changes: 2 additions & 2 deletions src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
},
"background": {
"scripts": [
"libs/tonweb-0.0.25.js",
"libs/tonweb-mnemonic-0.0.2.js",
"libs/tonweb-0.0.28.js",
"libs/tonweb-mnemonic-1.0.0.js",
"js/Controller.js"
],
"persistent": true
Expand Down