From ee23828a431ba9c648f335e577fd4be0f34a7307 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Tue, 5 Apr 2022 14:40:29 +0200 Subject: [PATCH 01/14] Add Trezor Suite connection details --- .../ConnectWallet/Wallets/TrezorSuite.vue | 53 +++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 src/components/ConnectWallet/Wallets/TrezorSuite.vue diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue new file mode 100644 index 00000000..0ead101d --- /dev/null +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -0,0 +1,53 @@ + + + From 78408828b78b408c936609bbc6c0ade82f79331b Mon Sep 17 00:00:00 2001 From: Simon Males Date: Tue, 5 Apr 2022 14:46:39 +0200 Subject: [PATCH 02/14] Add Trezor Suite: copy tweak --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 0ead101d..788ca35c 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -15,19 +15,19 @@ - Under Backends click Trezor servers and change it to - Custom Electrum server. + Under Backends click Trezor servers and select + Custom Electrum server from the dropdown menu. - In the next field "Server", enter + In the next field enter: - Press Confirm button. + Press the Confirm button. - Congratulations! You've successfully connected Trezor Sutie to your Umbrel. + Congratulations! You've successfully connected Trezor Suite to your Umbrel. From 40896858dd833ff0963f2e84050751e4a460d904 Mon Sep 17 00:00:00 2001 From: Marek Polak Date: Thu, 7 Apr 2022 10:20:10 +0200 Subject: [PATCH 03/14] Add Trezor Suite to wallets list --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 2 +- src/router/index.js | 8 ++++++++ src/views/ConnectWallet.vue | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 788ca35c..1983b89d 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -15,7 +15,7 @@ - Under Backends click Trezor servers and select + Under Backends click Trezor servers and select Custom Electrum server from the dropdown menu. diff --git a/src/router/index.js b/src/router/index.js index 28e1a339..02233fc9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -35,6 +35,7 @@ import Phoenix from "../components/ConnectWallet/Wallets/Phoenix.vue"; import SamouraiWallet from "../components/ConnectWallet/Wallets/SamouraiWallet.vue"; import Sparrow from "../components/ConnectWallet/Wallets/Sparrow.vue"; import SpecterDesktop from "../components/ConnectWallet/Wallets/SpecterDesktop.vue"; +import TrezorSuite from "../components/ConnectWallet/Wallets/TrezorSuite.vue"; import Wasabi from "../components/ConnectWallet/Wallets/Wasabi.vue"; import ZapAndroid from "../components/ConnectWallet/Wallets/ZapAndroid.vue"; @@ -249,6 +250,13 @@ const routes = [ wallet: "specter-desktop" } }, + { + path: "trezor-suite", + component: TrezorSuite, + meta: { + wallet: "trezor-suite" + } + }, { path: "wasabi", component: Wasabi, diff --git a/src/views/ConnectWallet.vue b/src/views/ConnectWallet.vue index b9a9f1c8..8b5cc8c0 100644 --- a/src/views/ConnectWallet.vue +++ b/src/views/ConnectWallet.vue @@ -61,6 +61,7 @@ export default { { value: "samourai-wallet", text: "Samourai Wallet" }, { value: "sparrow", text: "Sparrow" }, { value: "specter-desktop", text: "Specter Desktop" }, + { value: "trezor-suite", text: "Trezor Suite" }, { value: "wasabi", text: "Wasabi" }, { value: "zap-android", text: "Zap (Android)" }, { value: "zap-desktop", text: "Zap (Desktop)" }, From 7afc04c4ffeca2001889460d6b77e6d4a54051a3 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:44:23 +0200 Subject: [PATCH 04/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 1983b89d..16625da7 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -1,6 +1,10 @@ From 3ac3a7b1474bea45096fefa450bfc7071a633145 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:45:36 +0200 Subject: [PATCH 08/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 0a9401b4..f7b7a58a 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -9,7 +9,7 @@ Open Trezor Suite and connect your Trezor. - Make sure Tor is enabled in Trezor Suite. + Go to Settings > Application and make sure "Tor" is enabled. Open "Settings > Crypto". From c9c3dc04888dbc8d42c5a6250d99992de3ee6130 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:45:47 +0200 Subject: [PATCH 09/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index f7b7a58a..71eeddf9 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -17,7 +17,6 @@ Hover above Bitcoin and click the gear icon. - Under Backends click Trezor servers and select Custom Electrum server from the dropdown menu. From 25bd154bab066f1642d0b636d08c7722487549d7 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:45:59 +0200 Subject: [PATCH 10/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 71eeddf9..b2ab4b77 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -12,7 +12,7 @@ Go to Settings > Application and make sure "Tor" is enabled. - Open "Settings > Crypto". + Go to Settings > Crypto. Hover above Bitcoin and click the gear icon. From c08dbe2de0d7f36e59de456d5c98884fe9b251da Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:46:10 +0200 Subject: [PATCH 11/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index b2ab4b77..13588833 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -15,7 +15,7 @@ Go to Settings > Crypto. - Hover above Bitcoin and click the gear icon. + Hover above "Bitcoin" and click the gear icon. Under Backends click Trezor servers and select From 8d96687f961452ea84b28ce58c3fd5603dfc1e87 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:46:22 +0200 Subject: [PATCH 12/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 13588833..a490585b 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -18,10 +18,9 @@ Hover above "Bitcoin" and click the gear icon. - Under Backends click Trezor servers and select - Custom Electrum server from the dropdown menu. + Under "Backends" click "Trezor servers" and select + "Custom Electrum server" from the dropdown menu. - In the next field enter: From f0f25847b0a072334d45725ef268bc7db3befba9 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 12:46:29 +0200 Subject: [PATCH 13/14] Update src/components/ConnectWallet/Wallets/TrezorSuite.vue MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Lounès Ksouri --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index a490585b..64be00cb 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -26,7 +26,7 @@ - Press the Confirm button. + Press the "Confirm" button. Congratulations! You've successfully connected Trezor Suite to your Umbrel. From 008613b4242159c3fc5155854380c57d5a7dec87 Mon Sep 17 00:00:00 2001 From: Simon Males Date: Thu, 7 Apr 2022 16:27:52 +0200 Subject: [PATCH 14/14] Trezor: remove DIY TOR server references --- src/components/ConnectWallet/Wallets/TrezorSuite.vue | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/components/ConnectWallet/Wallets/TrezorSuite.vue b/src/components/ConnectWallet/Wallets/TrezorSuite.vue index 64be00cb..f8c75eb1 100644 --- a/src/components/ConnectWallet/Wallets/TrezorSuite.vue +++ b/src/components/ConnectWallet/Wallets/TrezorSuite.vue @@ -1,10 +1,6 @@ @@ -43,7 +35,6 @@ import ConnectionDetails from "@/components/ConnectWallet/ConnectionDetails"; import StepList from "@/components/ConnectWallet/StepList"; import Step from "@/components/ConnectWallet/Step"; -import TorSetup from "@/components/ConnectWallet/TorSetup.vue"; import InputCopy from "@/components/Utility/InputCopy"; export default { @@ -54,8 +45,7 @@ export default { ConnectionDetails, StepList, Step, - InputCopy, - TorSetup + InputCopy } };