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

Attach hardware wallets already in addressbook #4912

Merged
merged 2 commits into from
Mar 20, 2017

Conversation

jacogr
Copy link
Contributor

@jacogr jacogr commented Mar 14, 2017

The check to not re-create and override existing entries was too aggressive. Rather check if non-existent (the only original check) or not marked as a hardware device. (Re-use already created names/descriptions when found)

From https://github.com/ethcore/parity/issues/4889

@jacogr jacogr added A0-pleasereview 🤓 Pull request needs code review. B0-patch labels Mar 14, 2017
@ngotchac ngotchac added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 20, 2017
@gavofyork gavofyork merged commit 05cd715 into master Mar 20, 2017
@gavofyork gavofyork deleted the jg-ledger-from-addressbook branch March 20, 2017 18:14
jacogr added a commit that referenced this pull request Mar 22, 2017
* Attach hardware wallets already in addressbook

* Only set values changed
@jacogr jacogr mentioned this pull request Mar 22, 2017
arkpar pushed a commit that referenced this pull request Mar 22, 2017
* [ci skip] js-precompiled 20170314-121823

* Attach hardware wallets already in addressbook (#4912)

* Attach hardware wallets already in addressbook

* Only set values changed

* Add Vaults logic to First Run (#4894) (#4914)

* Add ability to configure Secure API (for #4885) (#4922)

* Add z-index to small modals as well (#4923)

* eth_sign where account === undefined (#4964)

* Update for case where account === undefined

* Update tests to not mask account === undefined

* default account = {} where undefined (thanks @tomusdrw)

* Fix Password Dialog forms style issue (#4968)
@5chdn 5chdn mentioned this pull request Apr 4, 2017
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