Fix send amount in tx

snapdao · Sep 6, 2023 · 09f7bbf · 09f7bbf
1 parent b35acc4
commit 09f7bbf
Showing 1 changed file with 12 additions and 3 deletions.
diff --git a/packages/example/src/hook/useTransaction.ts b/packages/example/src/hook/useTransaction.ts
@@ -21,7 +21,7 @@ export const useTransaction = ({ size, offset }: UseTransaction) => {
 
   const refresh = () => {
     setError(undefined);
-    if(!loading) {
+    if (!loading) {
       setCount(count + 1);
     }
   };
@@ -33,15 +33,15 @@ export const useTransaction = ({ size, offset }: UseTransaction) => {
   useEffect(() => {
     if (current && currentWalletType === WalletType.BitcoinWallet) {
       setLoading(true);
-      queryActivities({ coin: current.coinCode, count: size, loadMoreTxs: lastTx })
+      queryActivities({ coin: current.coinCode, count: size * 2, loadMoreTxs: lastTx })
         .then(res =>
           res.activities.map(tx => {
             const isReceive = tx.action === 'recv_external';
             return {
               ID: tx.txid,
               type: isReceive ? TransactionTypes.Received : TransactionTypes.Sent,
               status: tx.status === ActivityStatus.Complete ? TransactionStatus.Confirmed : TransactionStatus.Pending,
-              amount: Math.abs(tx.amount),
+              amount: (isReceive ? Math.abs(tx.amount) : tx.receiverAddresses?.[0]?.[1]) || 0,
               address: (isReceive ? tx.senderAddresses?.[0] : tx.receiverAddresses?.[0]?.[0]) || '',
               date: tx.createdTime * 1000,
               fee: tx.fee,
@@ -53,6 +53,15 @@ export const useTransaction = ({ size, offset }: UseTransaction) => {
               confirmThreshold: tx.confirmThreshold,
             };
           })
+            .reduce((list, cur) => {
+              if (list.some(tx => tx.ID === cur.ID)) {
+                // filter out the transaction indicates receiving, which is actually the transaction sent to change address,
+                // only keep the sending one for the same ID
+                return [...list, cur].filter(tx => tx.ID !== cur.ID || tx.type !== TransactionTypes.Received);
+              }
+              return [...list, cur];
+            }, [] as TransactionDetail[])
+            .slice(0, size)
         )
         .then((txList: TransactionDetail[]) => {
           setTxList(txList);