Skip to content

Commit

Permalink
Webcam info + wiki link on unlock screen
Browse files Browse the repository at this point in the history
  • Loading branch information
maciejhirsz committed Apr 6, 2018
1 parent 047b7a9 commit 0753ce8
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 2 deletions.
3 changes: 2 additions & 1 deletion common/components/WalletDecrypt/WalletDecrypt.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ import MetamaskIcon from 'assets/images/wallets/metamask.svg';
import MistIcon from 'assets/images/wallets/mist.svg';
import TrezorIcon from 'assets/images/wallets/trezor.svg';
import ParitySignerIcon from 'assets/images/wallets/parity-signer.svg';
import { wikiLink as paritySignerHelpLink } from 'libs/wallet/non-deterministic/parity';
import './WalletDecrypt.scss';
import { withRouter, RouteComponentProps } from 'react-router';

Expand Down Expand Up @@ -177,7 +178,7 @@ const WalletDecrypt = withRouter<Props>(
component: ParitySignerDecrypt,
initialParams: {},
unlock: this.props.setWallet,
helpLink: 'https://wiki.parity.io/Parity-Signer-Mobile-App-MyCrypto-tutorial.md'
helpLink: paritySignerHelpLink
},
[InsecureWalletName.KEYSTORE_FILE]: {
lid: 'X_KEYSTORE2',
Expand Down
2 changes: 1 addition & 1 deletion common/containers/ParitySignerDecrypt/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
width: 300px;
height: 300px;
display: inline-block;
margin-bottom: 1.5em;
margin: 1em 0 1.5em 0;
}
}
3 changes: 3 additions & 0 deletions common/containers/ParitySignerDecrypt/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import QrSigner from '@parity/qr-signer';
import { isValidETHAddress } from 'libs/validators';
import { ParitySignerWallet } from 'libs/wallet';
import { showNotification, TShowNotification } from 'actions/notifications';
import { wikiLink } from 'libs/wallet/non-deterministic/parity';
import './index.scss';
import AppStoreBadge from 'assets/images/mobile/app-store-badge.png';
import GooglePlayBadge from 'assets/images/mobile/google-play-badge.png';
Expand All @@ -19,6 +20,8 @@ class ParitySignerDecrypt extends PureComponent<Props> {
public render() {
return (
<div className="ParitySignerUnlock">
<p>{translate('ADD_PARITY_4')}</p>
<p>{translate('ADD_PARITY_5', { $wiki_link: wikiLink })}</p>
<div className="ParitySignerUnlock-qr-bounds">
<QrSigner
size={300}
Expand Down
2 changes: 2 additions & 0 deletions common/libs/wallet/non-deterministic/parity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { IFullWallet } from '../IWallet';

export const wikiLink = 'https://wiki.parity.io/Parity-Signer-Mobile-App-MyCrypto-tutorial.md';

export default class ParitySignerWallet implements IFullWallet {
public address: string;

Expand Down
2 changes: 2 additions & 0 deletions common/translations/lang/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@
"ADD_PARITY_1": "Transaction canceled ",
"ADD_PARITY_2": "Download the app ",
"ADD_PARITY_3": "Scan",
"ADD_PARITY_4": "Please enable your Webcam",
"ADD_PARITY_5": "For more information, visit [Parity Wiki]($wiki_link).",
"ADD_RADIO_2": "Select Your Wallet File (Keystore / JSON) ",
"ADD_RADIO_2_ALT": "Select Your Wallet File ",
"ADD_RADIO_2_SHORT": "SELECT WALLET FILE",
Expand Down

0 comments on commit 0753ce8

Please sign in to comment.