Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Implement Ledger Live bridge #10293

Merged
merged 33 commits into from
Apr 26, 2021
Merged

Implement Ledger Live bridge #10293

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f8f7221
uri intent
PatrykLucka Oct 21, 2020
8d15a7c
remove console log
PatrykLucka Oct 21, 2020
924cb65
remove open bridge on click
PatrykLucka Nov 3, 2020
08d5ecd
update add hardware wallet design
PatrykLucka Dec 8, 2020
770f4da
uri intent
PatrykLucka Oct 21, 2020
070c18f
remove console log
PatrykLucka Oct 21, 2020
75c22ae
remove open bridge on click
PatrykLucka Nov 3, 2020
bde398c
update yarn.lock
PatrykLucka Jan 11, 2021
6d78d85
Conditionally add assets
darkwing Jan 27, 2021
c0efd71
Introduce advanced feature toggle for using ledger live instead of u2f
darkwing Jan 27, 2021
23710d2
Add localization
darkwing Feb 10, 2021
718a52e
Send useLedgerLive setting to the user
darkwing Feb 11, 2021
e0f72d2
Fix metamask controller tests
darkwing Feb 11, 2021
60fafe5
Don't allow non-WebUSB users to turn on Ledger Live, provide more spe…
darkwing Feb 12, 2021
84ff751
Remove USB check
darkwing Feb 18, 2021
931b86c
Remove irrelevant test
darkwing Feb 22, 2021
d7ec62b
Use async setLedgerLivePreference in controller
darkwing Mar 2, 2021
de08464
Fix l10n
darkwing Mar 2, 2021
4b4ec1d
Don't use redux pattern for setLedgerLivePreference
darkwing Mar 3, 2021
ea39201
Remove rogue comma from l10n as result of rebase
darkwing Mar 16, 2021
08708ad
Await keyring retrieval
darkwing Mar 16, 2021
e631845
Communicate the ledger live preference in the MetaMask Controller sub…
darkwing Mar 22, 2021
5de54f6
Protect the updateTransportMethod call
darkwing Mar 25, 2021
96e1426
Restore eth-ledger-bridge-keyring package
darkwing Mar 25, 2021
09741f3
Add fallback for unsuccessful transporot update, localize text
darkwing Apr 14, 2021
629ab6e
Update to ledger keyring to 0.4.0
darkwing Apr 20, 2021
e473bcf
Address minor feedback
darkwing Apr 21, 2021
daaf61e
Show loading indicator for ledger live preference toggle
darkwing Apr 21, 2021
e1bf3a6
Use proper CSS naming for message link
darkwing Apr 22, 2021
972f2ca
Remove unused CSS class
darkwing Apr 22, 2021
e8c9000
Remove unnecessary pointer cursor
darkwing Apr 22, 2021
b907808
Re-throw error
darkwing Apr 22, 2021
7b5a27a
Update text in e2e test
darkwing Apr 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add localization
  • Loading branch information
@darkwing
darkwing committed Apr 23, 2021
commit 23710d2eb75ba75b7e2aca294f7b1567f59e2cda
9 changes: 9 additions & 0 deletions app/_locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,6 +985,15 @@
"ledgerTimeout": {
"message": "Ledger Live is taking too long to respond or connection timeout. Make sure Ledger Live app is opened and your device is unlocked."
},
"ledgerLiveAdvancedSetting": {
"message": "Use Ledger Live"
},
"hardwareWalletSupportLinkConversion": {
"message": "click here"
},
"ledgerLiveAdvancedSettingDescription": {
"message": "The new Ledger Live bridge allows you to more easily use your Ledger."
},
"letsGoSetUp": {
"message": "Yes, let’s get set up!"
},
Expand Down
1 change: 0 additions & 1 deletion ui/app/pages/create-account/connect-hardware/account-list.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ class AccountList extends Component {
</h3>
<p className="hw-connect__msg">
{this.context.t('selectAnAccountHelp', [
// eslint-disable-next-line react/jsx-key
<span
className="hw-connect__msg__link"
onClick={() => this.setState({ showPopover: true })}
Expand Down
4 changes: 2 additions & 2 deletions ui/app/pages/create-account/connect-hardware/select-hardware.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ export default class SelectHardware extends Component {
rel="noopener noreferrer"
target="_blank"
>
click here
{t('hardwareWalletSupportLinkConversion')}
</a>,
]),
},
Expand Down Expand Up @@ -206,7 +206,7 @@ export default class SelectHardware extends Component {
rel="noopener noreferrer"
target="_blank"
>
click here
{t('hardwareWalletSupportLinkConversion')}
</a>,
]),
},
Expand Down
4 changes: 2 additions & 2 deletions ui/app/pages/settings/advanced-tab/advanced-tab.component.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -393,9 +393,9 @@ export default class AdvancedTab extends PureComponent {
return (
<div className="settings-page__content-row">
<div className="settings-page__content-item">
<span>Use Ledger Live</span>
<span>{t('ledgerLiveAdvancedSetting')}</span>
<div className="settings-page__content-description">
The new Ledger Live bridge allows you to more easily use your Ledger
{t('ledgerLiveAdvancedSettingDescription')}
</div>
</div>
<div className="settings-page__content-item">
Expand Down