From 1a862f1b385ff9985ef70d8a2022b5b8fbf21415 Mon Sep 17 00:00:00 2001
From: unclebill <billbill290@gmail.com>
Date: Mon, 25 Apr 2022 12:36:14 +0800
Subject: [PATCH] fix(transation): cancelled detection

closes #MF-553
---
 .../src/plugins/Wallet/services/transaction/helpers.ts    | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/packages/mask/src/plugins/Wallet/services/transaction/helpers.ts b/packages/mask/src/plugins/Wallet/services/transaction/helpers.ts
index d7840b9331de..00c624ecec12 100644
--- a/packages/mask/src/plugins/Wallet/services/transaction/helpers.ts
+++ b/packages/mask/src/plugins/Wallet/services/transaction/helpers.ts
@@ -2,7 +2,6 @@ import { sha3, toHex } from 'web3-utils'
 import type { JsonRpcPayload } from 'web3-core-helpers'
 import type { Transaction, TransactionConfig, TransactionReceipt } from 'web3-core'
 import {
-    isSameAddress,
     TransactionState,
     TransactionStateType,
     TransactionStatusType,
@@ -59,7 +58,6 @@ export function getReceiptStatus(receipt: TransactionReceipt | null) {
     const status = receipt.status as unknown as string
     if (receipt.status === false || ['0', '0x', '0x0'].includes(status)) return TransactionStatusType.FAILED
     if (receipt.status === true || ['1', '0x1'].includes(status)) {
-        if (isSameAddress(receipt.from, receipt.to)) return TransactionStatusType.CANCELLED
         return TransactionStatusType.SUCCEED
     }
     return TransactionStatusType.NOT_DEPEND
@@ -87,12 +85,6 @@ export function getTransactionState(receipt: TransactionReceipt): TransactionSta
                     receipt,
                     error: new Error('Invalid transaction status.'),
                 }
-            case TransactionStatusType.CANCELLED:
-                return {
-                    type: TransactionStateType.FAILED,
-                    receipt,
-                    error: new Error('CANCELLED'),
-                }
             default:
                 unreachable(status)
         }