Merge branch 'master' into feature/copy-log

2025-02-21 12:32:03 +00:00 · 2019-03-04 16:29:07 +01:00 · 2019-03-04 16:29:07 +01:00 · 22c963bc2f
commit 22c963bc2f
parent 8f2f2d0bc7 120edb52a3
5 changed files with 12 additions and 0 deletions
--- a/.eslintignore
+++ b/.eslintignore
@ -1,6 +1,7 @@
 public
 build
 coverage
+cache/**
 node_modules
 src/flowtype/npm
 scripts/solidity/.*
--- a/.prettierignore
+++ b/.prettierignore
@ -0,0 +1,8 @@
+public
+build
+coverage
+cache/**
+node_modules
+src/flowtype/npm
+scripts/solidity/.*
+**/_old/*
--- a/README.md
+++ b/README.md
@ -1,3 +1,5 @@
+![Alt text](src/images/wallet-rocks.png?raw=true "Trezor Wallet rocks")
+
 # Trezor Wallet

 You can try this wallet live [HERE](https://beta-wallet.trezor.io/next/)
--- a/src/images/wallet-rocks.png
+++ b/src/images/wallet-rocks.png
--- a/src/views/Wallet/views/Account/SignVerify/index.js
+++ b/src/views/Wallet/views/Account/SignVerify/index.js
@ -197,6 +197,7 @@ class SignVerify extends Component<Props> {
                                <FormattedMessage {...l10nCommonMessages.TR_CLEAR} />
                            </StyledButton>
                            <StyledButton
+                                isDisabled={verifyAddressError}
                                onClick={() => {
                                    if (errors.length <= 0) {
                                        signVerifyActions.verify(