Merge branch 'master' into feature/footer-translators

src/components/Footer/index.js

@@ -97,7 +97,7 @@ const Footer = ({ opened, toggle, isLanding }: Props) => {
                 <StyledLink href="http://satoshilabs.com" isGreen>
                     SatoshiLabs
                 </StyledLink>
-                <StyledLink href="https://trezor.io/static/pdf/tos.pdf" isGreen>
+                <StyledLink href="https://trezor.io/tos" isGreen>
                     <FormattedMessage {...l10nMessages.TR_TERMS} />
                 </StyledLink>
                 <StyledLink onClick={toggle} isGreen>

src/components/modals/external/Nem/index.js

@@ -60,7 +60,7 @@ const NemWallet = (props: Props) => (
         </H4>
         <Img src={NemImage} />
         <Link href={coins.find(i => i.id === 'xem').url}>
-            <StyledButton>
+            <StyledButton onClick={props.onCancel}>
                 <FormattedMessage {...l10nMessages.TR_GO_TO_NEM_DOT_IO} />
             </StyledButton>
         </Link>

src/components/modals/external/Stellar/index.js

@@ -62,7 +62,7 @@ const StellarWallet = (props: Props) => (
         </P>
 
         <Link href={coins.find(i => i.id === 'xlm').url}>
-            <StyledButton>
+            <StyledButton onClick={props.onCancel}>
                 <FormattedMessage {...l10nCommonMessages.TR_GO_TO_EXTERNAL_WALLET} />
             </StyledButton>
         </Link>