Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix wrong token handling #4254

Merged
merged 4 commits into from
Jan 20, 2017
Merged

Fix wrong token handling #4254

merged 4 commits into from
Jan 20, 2017

Conversation

ngotchac
Copy link
Contributor

Fixes #4241

Filter out all tokens registered with ETH TLA. Correctly handles tokens.

@ngotchac ngotchac added A0-pleasereview 🤓 Pull request needs code review. M7-ui labels Jan 20, 2017
@jacogr
Copy link
Contributor

jacogr commented Jan 20, 2017

Something is wonky -

parity 2017-01-20 18-59-19

@jacogr jacogr added A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jan 20, 2017
@ngotchac
Copy link
Contributor Author

ngotchac commented Jan 20, 2017

@jacogr Ah yes, wasn't supposed to happen with filtering... Will fix

@ngotchac ngotchac added A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. and removed A5-grumble 🔥 Pull request has minor issues that must be addressed before merging. labels Jan 20, 2017
@ngotchac ngotchac added A0-pleasereview 🤓 Pull request needs code review. and removed A3-inprogress ⏳ Pull request is in progress. No review needed at this stage. labels Jan 20, 2017
@jacogr jacogr added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Jan 20, 2017
@jacogr
Copy link
Contributor

jacogr commented Jan 20, 2017

Marked looksgood with provision for https://github.com/ethcore/parity/pull/4254 (i.e. FIXME - as discussed, would just bloat the PR way too much)

@jacogr jacogr merged commit 8edaab8 into master Jan 20, 2017
@jacogr jacogr deleted the ng-real-tokens-fix branch January 20, 2017 18:49
arkpar pushed a commit that referenced this pull request Feb 3, 2017
* Fixing wrong token displayed

* Linting

* Revert filtering out

* Revert the revert
gavofyork pushed a commit that referenced this pull request Feb 3, 2017
* v1.5.1

* Disable notifications (#4243)

* Fix wrong token handling (#4254)

* Fixing wrong token displayed

* Linting

* Revert filtering out

* Revert the revert

* Don't panic on uknown git commit hash (#4231)

* Additional logs for own transactions (#4278)

* Integration with zgp whitelist contract (#4215)

* zgp-transactions checker

* polishing

* rename + refactor

* refuse-service-transactions cl option

* fixed tests compilation

* Renaming signAndSendTransaction to sendTransaction (#4351)

* Fixed deadlock in external_url (#4354)

* Fixing web3 in console (#4382)

* Fixing estimate gas in case histogram is not available (#4387)

* Restarting fetch client every now and then (#4399)
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A8-looksgood 🦄 Pull request is reviewed well.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants