Skip to content

Commit

Permalink
precommit
Browse files Browse the repository at this point in the history
version bump
fixed the ledger issue link
  • Loading branch information
TobiaszCudnik committed Apr 15, 2019
1 parent ab37903 commit f5be315
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion desktop/package.json
@@ -1,7 +1,7 @@
{
"name": "rise-wallet-desktop",
"description": "Rise Wallet",
"version": "1.1.2",
"version": "1.1.3",
"author": "rise.vision",
"engines": {
"yarn": "^1.10.1"
Expand Down
2 changes: 1 addition & 1 deletion package.json
@@ -1,6 +1,6 @@
{
"name": "rise-wallet",
"version": "1.1.2",
"version": "1.1.3",
"engines": {
"yarn": "^1.10.1"
},
Expand Down
10 changes: 4 additions & 6 deletions src/components/ConfirmTxStatusFooter.tsx
Expand Up @@ -158,8 +158,7 @@ class ConfirmTxStatusFooter extends React.Component<DecoratedProps> {
id="confirm-tx-status-footer.error-msg"
description="Message for when a transaction failed to broadcast."
defaultMessage={
'Failed to broadcast the transaction to the network: {error}'
}
'Failed to broadcast the transaction to the network: {error}'}
values={{
error: reason || 'N/A'
}}
Expand All @@ -175,7 +174,7 @@ class ConfirmTxStatusFooter extends React.Component<DecoratedProps> {
id="confirm-tx-status-footer.ledger-another-device-msg"
description="Message for when the user has connected the wrong Ledger."
defaultMessage={
"The connected Ledger doesn't manage this account. Either you used " +
'The connected Ledger doesn\'t manage this account. Either you used ' +
'an additional passphrase (in your Ledger) when adding this account ' +
'or you have plugged in a device with a different mnemonic.'
}
Expand Down Expand Up @@ -209,14 +208,13 @@ class ConfirmTxStatusFooter extends React.Component<DecoratedProps> {
id="confirm-tx-status-footer.ledger-confirming-msg-twice"
description="Double confirmation issue notification."
defaultMessage={
'You may have to confirm twice. Its a {link}.'
}
'You may have to confirm twice. Its a {link}.'}
values={{
seconds: timeout || 0,

link: (
<a
href="https://github.com/LedgerHQ/ledgerjs/issues/315"
href="https://support.ledger.com/hc/en-us/articles/360018810413-U2F-timeout-in-Chrome-browser"
target="_blank"
>
{intl.formatMessage(messages.ledgerDoubleConfirmLink)}
Expand Down
2 changes: 1 addition & 1 deletion src/containers/onboarding/AddAccountPage.tsx
Expand Up @@ -65,7 +65,7 @@ class AddAccountPage extends React.Component<Props> {
handleBeforeNavigate = () => {
const { onboardingStore } = this.injected;
onboardingStore.reset();
};
}

componentWillMount() {
// establish communication with a ledger
Expand Down

0 comments on commit f5be315

Please sign in to comment.