diff --git a/web/cashtab/src/hooks/useWallet.js b/web/cashtab/src/hooks/useWallet.js --- a/web/cashtab/src/hooks/useWallet.js +++ b/web/cashtab/src/hooks/useWallet.js @@ -205,7 +205,7 @@ const preliminaryTokensArray = getPreliminaryTokensArray(preliminarySlpUtxos); - const { finalTokenArray, updatedTokenInfoById, newTokensToCache } = + const { tokens, updatedTokenInfoById, newTokensToCache } = await finalizeTokensArray( chronik, preliminaryTokensArray, @@ -222,13 +222,13 @@ }); } - const finalizedSlpUtxos = finalizeSlpUtxos( + const slpUtxos = finalizeSlpUtxos( preliminarySlpUtxos, updatedTokenInfoById, ); const { - chronikTxHistory, + parsedTxHistory, txHistoryUpdatedTokenInfoById, txHistoryNewTokensToCache, } = await getTxHistoryChronik( @@ -253,18 +253,18 @@ const newState = { balances: getWalletBalanceFromUtxos(nonSlpUtxos), - tokens: finalTokenArray, - slpUtxos: finalizedSlpUtxos, + slpUtxos, nonSlpUtxos, - parsedTxHistory: chronikTxHistory, + tokens, + parsedTxHistory, }; const walletStateAfterThisStack = { balances: getWalletBalanceFromUtxos(nonSlpUtxos), - slpUtxos: finalizedSlpUtxos, + slpUtxos, nonSlpUtxos, - tokens: finalTokenArray, - parsedTxHistory: chronikTxHistory, + tokens, + parsedTxHistory, }; console.log(`walletStateAfterThisStack`, walletStateAfterThisStack); diff --git a/web/cashtab/src/utils/__tests__/chronik.test.js b/web/cashtab/src/utils/__tests__/chronik.test.js --- a/web/cashtab/src/utils/__tests__/chronik.test.js +++ b/web/cashtab/src/utils/__tests__/chronik.test.js @@ -154,7 +154,7 @@ expect( await finalizeTokensArray(chronik, mockPreliminaryTokensArray), ).toStrictEqual({ - finalTokenArray: mockFinalTokenArray, + tokens: mockFinalTokenArray, updatedTokenInfoById: mockFinalCachedTokenInfo, newTokensToCache: true, }); @@ -173,7 +173,7 @@ mockFinalCachedTokenInfo, ), ).toStrictEqual({ - finalTokenArray: mockFinalTokenArray, + tokens: mockFinalTokenArray, updatedTokenInfoById: mockFinalCachedTokenInfo, newTokensToCache: false, }); @@ -202,7 +202,7 @@ mockPartialCachedTokenInfo, ), ).toStrictEqual({ - finalTokenArray: mockFinalTokenArray, + tokens: mockFinalTokenArray, updatedTokenInfoById: mockFinalCachedTokenInfo, newTokensToCache: true, }); diff --git a/web/cashtab/src/utils/chronik.js b/web/cashtab/src/utils/chronik.js --- a/web/cashtab/src/utils/chronik.js +++ b/web/cashtab/src/utils/chronik.js @@ -321,7 +321,7 @@ updatedTokenInfoById, ); - return { finalTokenArray, updatedTokenInfoById, newTokensToCache }; + return { tokens: finalTokenArray, updatedTokenInfoById, newTokensToCache }; }; export const finalizeSlpUtxos = (preliminarySlpUtxos, tokenInfoById) => { @@ -855,7 +855,7 @@ // Edge case to find uncached token info in tx history that was not caught in processing utxos // Requires performing transactions in one wallet, then loading the same wallet in another browser later return { - chronikTxHistory, + parsedTxHistory: chronikTxHistory, txHistoryUpdatedTokenInfoById: tokenInfoById, txHistoryNewTokensToCache, };