fix

nervosnetwork · Jul 1, 2024 · b2ab769 · b2ab769 · github-actions · Jul 1, 2024
1 parent b79720a
commit b2ab769
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts b/packages/neuron-wallet/src/block-sync-renderer/tx-status-listener.ts
@@ -77,15 +77,15 @@ const trackingStatus = async () => {
 
   const failedTxs = txs.filter(
     (tx): tx is (TransactionDetail | null) & { status: TransactionStatus.Failed; isRejected: boolean } =>
-      tx?.status === TransactionStatus.Failed && !tx?.isRejected
+      tx?.status === TransactionStatus.Failed
   )
   const successTxs = txs.filter(
     (tx): tx is (TransactionDetail | null) & { status: TransactionStatus.Success; isRejected: boolean } =>
       tx?.status === TransactionStatus.Success
   )
   const rejectedTxs = txs.filter(
     (tx): tx is (TransactionDetail | null) & { status: TransactionStatus.Failed; isRejected: boolean } =>
-      tx?.status === TransactionStatus.Failed && !!tx?.isRejected
+      !!tx?.isRejected
   )
 
   if (failedTxs.length) {

diff --git a/packages/neuron-wallet/src/services/rpc-service.ts b/packages/neuron-wallet/src/services/rpc-service.ts
@@ -37,7 +37,7 @@ export default class RpcService {
     if (result?.transaction) {
       return TransactionWithStatus.fromSDK(result)
     }
-    if (result?.txStatus && result.txStatus.status === TxStatusType.Rejected) {
+    if (result.txStatus.status === TxStatusType.Rejected) {
       logger.warn(`Transaction[${hash}] was rejected`)
       return {
         transaction: null,
@@ -59,7 +59,7 @@ export default class RpcService {
     if (result?.transaction) {
       return TransactionWithStatus.fromSDK(result)
     }
-    if (result?.txStatus && result.txStatus.status === TxStatusType.Rejected) {
+    if (result.txStatus.status === TxStatusType.Rejected) {
       logger.warn(`Transaction[${hash}] was rejected`)
     }
     return undefined

diff --git a/packages/neuron-wallet/tests/block-sync-renderer/tx-status-listener.intg.test.ts b/packages/neuron-wallet/tests/block-sync-renderer/tx-status-listener.intg.test.ts
@@ -24,7 +24,7 @@ const resetMocks = () => {
 }
 
 stubbedRPCServiceConstructor.mockImplementation(() => ({
-  getTransaction: stubbedGetTransactionFn,
+  getTransactionIncludeRejected: stubbedGetTransactionFn,
   getHeader: stubbedGetHeaderFn,
 }))