Skip to content
This repository was archived by the owner on May 24, 2022. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
20 changes: 14 additions & 6 deletions packages/fether-react/src/Scanner/Scanner.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import React from 'react';
import QrSigner from '@parity/qr-signer';
import { ExternalLink } from 'fether-ui';

import loading from '../assets/img/icons/loading.svg';

Expand Down Expand Up @@ -46,18 +47,17 @@ export default class Scanner extends React.PureComponent {
switch (e.name) {
case 'NotAllowedError':
case 'SecurityError':
errorMessage = 'Access to the webcam was refused.';
errorMessage = 'Webcam access was refused.';
break;
case 'NotFoundError':
case 'OverconstrainedError':
errorMessage = 'No webcam found on the device.';
errorMessage = 'Webcam not found on the device.';
break;
case 'NotReadableError':
errorMessage =
'Webcam hardware error. Try restarting your computer';
errorMessage = 'Webcam permissions or hardware error.';
break;
default:
errorMessage = 'Unknown error.';
errorMessage = 'Webcam unknown error.';
}
this.setState({
webcamError: errorMessage,
Expand All @@ -77,7 +77,15 @@ export default class Scanner extends React.PureComponent {
{isLoading ? (
<img alt='loading' src={loading} />
) : webcamError ? (
<p>{webcamError}</p>
<div>
<p>
{webcamError}&nbsp;Try the&nbsp;

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd go for "Visit Fether FAQ to help troubleshooting this issue" with a direct link to the question: https://wiki.parity.io/Fether-FAQ#how-to-fix-a-webcam-error

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've pushed a commit addressing your comment

<ExternalLink
name='Fether FAQ'
href='https://wiki.parity.io/Fether-FAQ'
/>
</p>
</div>
) : (
<div>
<p>{label}</p>
Expand Down
4 changes: 4 additions & 0 deletions packages/fether-react/src/assets/sass/shared/_basics.scss
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ a:visited {
}
}

.external-link {
color: $blue !important;
}

button,
input[type='text'],
input[type='number'],
Expand Down
17 changes: 17 additions & 0 deletions packages/fether-ui/src/ExternalLink/ExternalLink.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
// This file is part of Parity.
//
// SPDX-License-Identifier: BSD-3-Clause

import React from 'react';

export const ExternalLink = ({ name, href }) => (
<a
className='external-link'
href={href}
target='_blank'
rel='noopener noreferrer'
>
{name}
</a>
);
6 changes: 6 additions & 0 deletions packages/fether-ui/src/ExternalLink/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2015-2019 Parity Technologies (UK) Ltd.
// This file is part of Parity.
//
// SPDX-License-Identifier: BSD-3-Clause

export * from './ExternalLink';
1 change: 1 addition & 0 deletions packages/fether-ui/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export * from './AddressShort';
export * from './Card';
export * from './Clickable';
export * from './ClickToCopy';
export * from './ExternalLink';
export * from './Form';
export * from './Header';
export * from './Modal';
Expand Down