Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom

Order shapeshift transactions by time within the transactions list #6021

Merged
merged 4 commits into from
Jan 25, 2019
Merged

Order shapeshift transactions by time within the transactions list #6021

merged 4 commits into from
Jan 25, 2019
+1,028 −50

Conversation

alextsg
Copy link
Contributor

@alextsg alextsg commented Jan 14, 2019

Fixes #5943

@tmashuang
Copy link
Contributor

tmashuang commented Jan 14, 2019 •
edited
Loading

Screenshots of the issue with on integration.
Before:
1

After:
2

The tx ordering has changed and the test runs each individual cell for the status in this file
https://github.com/MetaMask/metamask-extension/blob/d8ab9cc002c10757b7382a174dafff7a0247e307/test/integration/lib/tx-list-items.js

I think the state is coming from
https://github.com/MetaMask/metamask-extension/blob/30a2be85eebe4f6b8cddb297f14faba392fe1133/development/states/tx-list-items.json

@alextsg
Copy link
Contributor Author

alextsg commented Jan 14, 2019

Thanks @tmashuang , looking into this now and figuring out which should be the correct order, as it looks like some of the mock data may be incomplete.

@metamaskbot
Copy link
Collaborator

Builds ready [24deeb2]: mascara, chrome, firefox, edge, opera

@danjm danjm self-assigned this Jan 22, 2019
danjm
danjm previously approved these changes Jan 23, 2019
View reviewed changes
@danjm danjm force-pushed the i5943-shapeshift-tx branch from fcb3c76 to 246c262 Compare January 23, 2019 02:20
@whymarrh whymarrh force-pushed the i5943-shapeshift-tx branch from 25cea31 to bf4b677 Compare January 24, 2019 23:03
@metamaskbot
Copy link
Collaborator

Builds ready [bf4b677]: mascara, chrome, firefox, edge, opera

@whymarrh whymarrh mentioned this pull request Jan 25, 2019
Closed
@danjm danjm merged commit ab9c20d into develop Jan 25, 2019
@whymarrh whymarrh deleted the i5943-shapeshift-tx branch January 26, 2019 16:48
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@whymarrh whymarrh whymarrh approved these changes

@danjm danjm danjm approved these changes

Assignees

@danjm danjm

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@alextsg @tmashuang @metamaskbot @whymarrh @danjm