-
Notifications
You must be signed in to change notification settings - Fork 54
Conversation
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Awesome, working perfectly!
030864b
to
5b32325
Compare
a563197
to
86411b9
Compare
Hi there! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Code-wise looks good!
I haven't tested the edge cases though. But I know there's enough eyes :)
My guess is that this is related to my changes to blocknative api key. I'll do that and let you know when you can test it |
@ramirotw or whoever takes over this PR I've added the PR URL to the list of allowed origins from blocknative
|
Hey @alfetopito , @ramirotw , can I retest it? |
Not yet, need to resolve the conflicts with the base branch |
7d8f457
to
e5ab265
Compare
@alfetopito @elena-zh I rebased the branch and solved all the conflicts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Cancellation is working, I can see the "cancelling" state, but the final state is "Confirmed"
This is the original wrap tx https://rinkeby.etherscan.io/tx/0xf5d4cf1c03436b6e2f76a3fb67f912b5d7750bd157e4d8f7e317f8015a337f39
And this is the cancellation tx which overwrote that one https://rinkeby.etherscan.io/tx/0x8de6d7df50b61024aa029e29e4a6cfd4f85559b5e7883e8fc04f028c63cf5f00
We might need to store something in the local state to indicate the successful transaction was actually a cancellation.
Or can we get that info from the executed tx?
Maybe we can use the tx input data (0x
) to detect it is a cancel transaction?
As @alfetopito I see 'Confirmed' state for wrap/unwrap transactions when they are cancelled Besides, changes are not applied to 'Approve' toke transaction: cancelled transaction stays in 'Open' status forever |
I have retested changes. Also, I got 'Cancelling' forever transaction when it is successfully cancelled: However, transaction details details navigate to success transaction https://rinkeby.etherscan.io/tx/0x8bd46631aca1617fcc764c1bdeb5634ac3276317322d16578d4884e8ad5c1c01 |
@elena-zh please re test |
Hey @ramirotw , thanks! However, I have faced 2 issues during testing changes.
|
If I'm not mistaken, all described issues might be related to #1832 task. |
Summary
Closes #1382 #1435
This adds a
Cancelling
andCancelled
states for ethereum transactions in the Recent Activity list. Before cancelled txs were removed from the list when they were confirmed.The changes are built on top of @anxolin's PR #1429 as I'm making use of the new
EnhancedTransactionDetails
type and also to reduce conflicts due to changes in theenhancedTransactions
state files.To Test
Cancelling
and thenCancelled
when confirmed