From d45a4b7ecaa555ea979eea9ceb0a570ace353c9f Mon Sep 17 00:00:00 2001
From: Jan Czibula <>
Date: Thu, 28 Feb 2019 15:27:29 +0100
Subject: [PATCH 1/2] #410 Link to "bitcoin wallet" shouldn't be opened in new
 tab

---
 src/views/Wallet/views/DeviceSettings/index.js | 2 +-
 src/views/Wallet/views/FirmwareUpdate/index.js | 2 +-
 src/views/Wallet/views/Initialize/index.js     | 2 +-
 src/views/Wallet/views/NoBackup/index.js       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/Wallet/views/DeviceSettings/index.js b/src/views/Wallet/views/DeviceSettings/index.js
index 6874297e..6a3f0fdf 100644
--- a/src/views/Wallet/views/DeviceSettings/index.js
+++ b/src/views/Wallet/views/DeviceSettings/index.js
@@ -51,7 +51,7 @@ const DeviceSettings = (props: Props) => (
                 />
                 <StyledH1>Device settings is under construction</StyledH1>
                 <StyledP>Please use Bitcoin wallet interface to change your device settings</StyledP>
-                <Link href={getOldWalletUrl(props.device)}>
+                <Link href={getOldWalletUrl(props.device)} target="_self">
                     <Button>Take me to the Bitcoin wallet</Button>
                 </Link>
             </Row>
diff --git a/src/views/Wallet/views/FirmwareUpdate/index.js b/src/views/Wallet/views/FirmwareUpdate/index.js
index 40fad54e..bbbcac50 100644
--- a/src/views/Wallet/views/FirmwareUpdate/index.js
+++ b/src/views/Wallet/views/FirmwareUpdate/index.js
@@ -130,7 +130,7 @@ const FirmwareUpdate = (props: Props) => (
         </Image>
         <H1>It’s time to update your firmware</H1>
         <StyledP>Please use Bitcoin wallet interface to update your firmware.</StyledP>
-        <Link href={getOldWalletReleaseUrl(props.device)}>
+        <Link href={getOldWalletReleaseUrl(props.device)} target="_self">
             <Button>Take me to the Bitcoin wallet</Button>
         </Link>
         {deviceUtils.isDeviceAccessible(props.device) && (
diff --git a/src/views/Wallet/views/Initialize/index.js b/src/views/Wallet/views/Initialize/index.js
index 2447c7f6..d9ce4795 100644
--- a/src/views/Wallet/views/Initialize/index.js
+++ b/src/views/Wallet/views/Initialize/index.js
@@ -38,7 +38,7 @@ const Initialize = (props: Props) => (
         <Row>
             <H1>Your device is not initialized</H1>
             <StyledParagraph>Please use Bitcoin wallet interface to start initialization process</StyledParagraph>
-            <A href={getOldWalletUrl(props.device)}>
+            <A href={getOldWalletUrl(props.device)} target="_self">
                 <Button>Take me to the Bitcoin wallet</Button>
             </A>
         </Row>
diff --git a/src/views/Wallet/views/NoBackup/index.js b/src/views/Wallet/views/NoBackup/index.js
index f34dfd61..2752137b 100644
--- a/src/views/Wallet/views/NoBackup/index.js
+++ b/src/views/Wallet/views/NoBackup/index.js
@@ -57,7 +57,7 @@ const FirmwareUpdate = (props: Props) => (
             <StyledP>If your device is ever lost or damaged, your funds will be lost. Backup your device first, to protect your coins against such events.</StyledP>
             <P>Please use Bitcoin wallet interface to create a backup.</P>
         </Message>
-        <Link href={`${getOldWalletUrl(props.device)}?backup=1`}>
+        <Link href={`${getOldWalletUrl(props.device)}?backup=1`} target="_self">
             <Button>Take me to the Bitcoin wallet</Button>
         </Link>
         <StyledNavLink to="/">I’ll do that later.</StyledNavLink>

From d3926303eac6c6ac9e877bd6369279a3dffa7d83 Mon Sep 17 00:00:00 2001
From: slowbackspace <slowbackspace@gmail.com>
Date: Thu, 28 Feb 2019 16:19:08 +0100
Subject: [PATCH 2/2] open link to the old wallet in the same window in no
 backup modal

---
 src/components/modals/confirm/NoBackup/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/modals/confirm/NoBackup/index.js b/src/components/modals/confirm/NoBackup/index.js
index b94af096..45fafef1 100644
--- a/src/components/modals/confirm/NoBackup/index.js
+++ b/src/components/modals/confirm/NoBackup/index.js
@@ -70,7 +70,7 @@ const Confirmation = (props: Props) => (
         <Icon size={48} color={colors.WARNING_PRIMARY} icon={icons.WARNING} />
         <StyledP isSmaller>If your device is ever lost or damaged, your funds will be lost. Backup your device first, to protect your coins against such events.</StyledP>
         <Row>
-            <Link href={`${getOldWalletUrl(props.device)}/?backup`}>
+            <Link href={`${getOldWalletUrl(props.device)}/?backup`} target="_self">
                 <BackupButton onClick={() => props.onReceiveConfirmation(false)}>Create a backup in 3 minutes</BackupButton>
             </Link>
             <ProceedButton isWhite onClick={() => props.onReceiveConfirmation(true)}>Show address, I will take the risk</ProceedButton>