Skip to content

Commit a2db906

Browse files
committed
fix(ui): ⚡ Improve perceived load time of txs view
1 parent 8f02376 commit a2db906

File tree

2 files changed

+18
-7
lines changed

2 files changed

+18
-7
lines changed

src/helpers/wallet.js

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1800,9 +1800,12 @@ export function processInOut({
18001800

18011801
export async function getAddrsTransactions({
18021802
appState, addrs, contactAddrs = {},
1803+
txs = [],
18031804
}) {
18041805
let storeAddrs = await loadStoreObject(store.addresses)
1805-
let txs = await dashsight.getAllTxs(addrs)
1806+
if (txs.length === 0) {
1807+
txs = await dashsight.getAllTxs(addrs)
1808+
}
18061809
let byAddress = {}
18071810
let byAlias = {}
18081811
let byTx = {}
@@ -1891,8 +1894,8 @@ export async function getContactsByXkeyId(
18911894
let contactsXkeys = {}
18921895

18931896
for await (let c of appState.contacts) {
1894-
let og = Object.values(c.outgoing || [])?.[0]
1895-
let ic = Object.values(c.incoming || [])?.[0]
1897+
let og = Object.values(c.outgoing || {})?.[0]
1898+
let ic = Object.values(c.incoming || {})?.[0]
18961899

18971900
if (og) {
18981901
contactsXkeys[og.xkeyId] = {
@@ -1941,7 +1944,7 @@ export async function deriveContactAddrs(
19411944
let addrs = {}
19421945

19431946
for await (let c of appState.contacts) {
1944-
let og = Object.values(c[dir] || [])?.[0]
1947+
let og = Object.values(c[dir] || {})?.[0]
19451948
let xkey = og?.xpub || og?.xprv
19461949

19471950
if (xkey) {
@@ -1971,7 +1974,7 @@ export async function deriveContactAddrs(
19711974
return addrs
19721975
}
19731976

1974-
export async function getTxs(appState) {
1977+
export async function getTxs(appState, transactions = []) {
19751978
let contactAddrs = await getContactsFromAddrs(appState)
19761979
let contactOutAddrs = await deriveContactAddrs(appState)
19771980

@@ -1991,6 +1994,7 @@ export async function getTxs(appState) {
19911994

19921995
let txs = await getAddrsTransactions({
19931996
appState, addrs, contactAddrs,
1997+
txs: transactions,
19941998
})
19951999

19962000
// console.log('getTxs', {

src/main.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -808,11 +808,18 @@ async function main() {
808808
</section>
809809
`)
810810

811+
let txs = await getTxs(
812+
appState,
813+
Object.values(appState.transactions || {})
814+
)
815+
811816
await transactionsList.render({
812-
// transactions: appState.transactions,
817+
userInfo,
818+
contacts: appState.contacts,
819+
transactions: Object.values(txs.byTx),
813820
})
814821

815-
let txs = await getTxs(appState)
822+
txs = await getTxs(appState)
816823

817824
console.log('main getTxs', txs)
818825

0 commit comments

Comments
 (0)