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

[trezor] initial trezor support #1547

Merged
merged 13 commits into from
Dec 3, 2018
Merged

[trezor] initial trezor support #1547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9661c33
Detect and react to transport and connection events
matheusd Jul 6, 2018
5d1f60f
Trezor sign tx support
matheusd Jul 6, 2018
4ab680f
Pin and Passphrase modals
matheusd Jul 9, 2018
8ea37e6
Trezor Setup Page
matheusd Jul 10, 2018
5097192
Support signing messages on trezor
matheusd Jul 11, 2018
69fe85f
Add trezor wallet creation
matheusd Jul 24, 2018
8b3df4a
Clear device session on close wallet
matheusd Oct 10, 2018
d57249e
Fixes after rebase
matheusd Oct 23, 2018
2d906b8
Startup improvements
matheusd Oct 30, 2018
1ed6ec4
Only show console.log with debug on
matheusd Oct 30, 2018
0100e88
style nit
matheusd Oct 30, 2018
6b1413e
Fix verticalAccordion componentDidUpdate
matheusd Nov 30, 2018
f5cd803
Fix vertical accordion activation
matheusd Nov 30, 2018
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
2 changes: 2 additions & 0 deletions app/actions/DaemonActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { isTestNet } from "selectors";
import axios from "axios";
import { STANDARD_EXTERNAL_REQUESTS } from "main_dev/externalRequests";
import { DIFF_CONNECTION_ERROR } from "main_dev/constants";
import { enableTrezor } from "./TrezorActions";

export const DECREDITON_VERSION = "DECREDITON_VERSION";
export const SELECT_LANGUAGE = "SELECT_LANGUAGE";
Expand Down Expand Up @@ -294,6 +295,7 @@ export const startWallet = (selectedWallet) => (dispatch, getState) => {
dispatch({ type: WALLET_SETTINGS, currencyDisplay, gapLimit });
dispatch({ type: WALLET_STAKEPOOL_SETTINGS, activeStakePoolConfig, selectedStakePool, currentStakePoolConfig });
dispatch({ type: WALLET_LOADER_SETTINGS, discoverAccountsComplete });
selectedWallet.value.isTrezor && dispatch(enableTrezor());
setTimeout(()=>dispatch(versionCheckAction()), 2000);
})
.catch((err) => {
Expand Down
Loading