From a03d11d552599a5555082aa88b685eb72759d1f5 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Thu, 17 Mar 2022 23:51:13 -0600
Subject: [PATCH 1/5] Add Alby

---
 src/components/ConnectWallet/Wallets/Alby.vue | 50 +++++++++++++++++++
 src/router/index.js                           | 11 +++-
 src/views/ConnectWallet.vue                   |  1 +
 3 files changed, 60 insertions(+), 2 deletions(-)
 create mode 100644 src/components/ConnectWallet/Wallets/Alby.vue

diff --git a/src/components/ConnectWallet/Wallets/Alby.vue b/src/components/ConnectWallet/Wallets/Alby.vue
new file mode 100644
index 00000000..261880c5
--- /dev/null
+++ b/src/components/ConnectWallet/Wallets/Alby.vue
@@ -0,0 +1,50 @@
+<template>
+  <connection-details name="Alby" requires="lnd">
+    <step-list>
+      <step>
+        Add the Alby extension to your browser and open the app.
+      </step>
+      <step>
+        Click on <span class="font-weight-bold">"Get Started"</span>.
+      </step>
+      <step>
+        Enter and confirm your password, then click
+        <span class="font-weight-bold">"Next"</span>.
+      </step>
+      <step>
+        Select Umbrel from the connector options.
+      </step>
+      <step>
+        Copy this value into the
+        <span class="font-weight-bold">"lndconnect REST URL"</span>.
+        <input-copy
+          :value="urls.lnd.restTor.replace(/cert=(.*)&/gm, '')"
+          auto-width
+        ></input-copy>
+      </step>
+      <step>Click <span class="font-weight-bold">"Continue"</span>.</step>
+      <step>
+        Congratulations! You have successfully connected Alby to your Umbrel.
+      </step>
+    </step-list>
+  </connection-details>
+</template>
+
+<script>
+import ConnectionDetails from "@/components/ConnectWallet/ConnectionDetails";
+import StepList from "@/components/ConnectWallet/StepList";
+import Step from "@/components/ConnectWallet/Step";
+import InputCopy from "@/components/Utility/InputCopy";
+
+export default {
+  props: {
+    urls: Object,
+  },
+  components: {
+    ConnectionDetails,
+    StepList,
+    Step,
+    InputCopy,
+  },
+};
+</script>
diff --git a/src/router/index.js b/src/router/index.js
index 28e1a339..81000820 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -20,6 +20,7 @@ import ConnectWallet from "../views/ConnectWallet.vue";
 import Logout from "../views/Logout.vue";
 
 // Wallet components for wallet connector
+import Alby from "../components/ConnectWallet/Wallets/Alby.vue";
 import BitBoxApp from "../components/ConnectWallet/Wallets/BitBoxApp.vue";
 import BitcoinCoreP2P from "../components/ConnectWallet/Wallets/BitcoinCoreP2P.vue";
 import BitcoinCoreRPC from "../components/ConnectWallet/Wallets/BitcoinCoreRPC.vue";
@@ -36,7 +37,6 @@ import SamouraiWallet from "../components/ConnectWallet/Wallets/SamouraiWallet.v
 import Sparrow from "../components/ConnectWallet/Wallets/Sparrow.vue";
 import SpecterDesktop from "../components/ConnectWallet/Wallets/SpecterDesktop.vue";
 import Wasabi from "../components/ConnectWallet/Wallets/Wasabi.vue";
-
 import ZapAndroid from "../components/ConnectWallet/Wallets/ZapAndroid.vue";
 import ZapDesktop from "../components/ConnectWallet/Wallets/ZapDesktop.vue";
 import ZapiOS from "../components/ConnectWallet/Wallets/ZapiOS.vue";
@@ -165,6 +165,13 @@ const routes = [
             name: "connect",
             component: ConnectWallet,
             children: [
+			        {
+								path: "alby",
+								component: Alby,
+								meta: {
+									wallet: "alby"
+								}
+							},
               {
                 path: "bitboxapp",
                 component: BitBoxApp,
@@ -364,7 +371,7 @@ const router = new VueRouter({
       // For anchors
     } else if (to.hash) {
 
-      // 500ms timeout allows the page to load or else 
+      // 500ms timeout allows the page to load or else
       // smooth scrolling would not scroll to the correct position
       setTimeout(() => {
         const element = document.getElementById(to.hash.replace(/#/, ''))
diff --git a/src/views/ConnectWallet.vue b/src/views/ConnectWallet.vue
index b9a9f1c8..57fcaca9 100644
--- a/src/views/ConnectWallet.vue
+++ b/src/views/ConnectWallet.vue
@@ -49,6 +49,7 @@ export default {
     return {
       options: [
         { value: null, text: "Select your wallet", disabled: true },
+  			{ value: "alby", text: "Alby" },
         { value: "bitboxapp", text: "BitBoxApp" },
         { value: "blockstream-green", text: "Blockstream Green (Android)" },
         { value: "bluewallet", text: "BlueWallet" },

From cd9ebbe8bf74a09c5e56f4d20371f29651ac3ac0 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 22 Mar 2022 21:52:21 -0600
Subject: [PATCH 2/5] Add companion app message

---
 src/components/ConnectWallet/Wallets/Alby.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ConnectWallet/Wallets/Alby.vue b/src/components/ConnectWallet/Wallets/Alby.vue
index 261880c5..a4eaba11 100644
--- a/src/components/ConnectWallet/Wallets/Alby.vue
+++ b/src/components/ConnectWallet/Wallets/Alby.vue
@@ -2,7 +2,7 @@
   <connection-details name="Alby" requires="lnd">
     <step-list>
       <step>
-        Add the Alby extension to your browser and open the app.
+        Add the Alby extension to your browser and open the app. Because you are connecting over Tor, you will also need to install the Alby companion application.
       </step>
       <step>
         Click on <span class="font-weight-bold">"Get Started"</span>.

From 189455e751270d1467b8d371bb92fdfd257405b3 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 22 Mar 2022 21:56:51 -0600
Subject: [PATCH 3/5] Update index.js

---
 src/router/index.js | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/router/index.js b/src/router/index.js
index 81000820..5bed3601 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -165,13 +165,13 @@ const routes = [
             name: "connect",
             component: ConnectWallet,
             children: [
-			        {
-								path: "alby",
-								component: Alby,
-								meta: {
-									wallet: "alby"
-								}
-							},
+	      {
+		path: "alby",
+		component: Alby,
+		meta: {
+		wallet: "alby"
+		}
+	      },
               {
                 path: "bitboxapp",
                 component: BitBoxApp,

From 8d97e13251a0a9bf6aa461e13fa91f9908682aed Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 22 Mar 2022 21:57:43 -0600
Subject: [PATCH 4/5] Update ConnectWallet.vue

---
 src/views/ConnectWallet.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/ConnectWallet.vue b/src/views/ConnectWallet.vue
index 57fcaca9..ab8fd551 100644
--- a/src/views/ConnectWallet.vue
+++ b/src/views/ConnectWallet.vue
@@ -49,7 +49,7 @@ export default {
     return {
       options: [
         { value: null, text: "Select your wallet", disabled: true },
-  			{ value: "alby", text: "Alby" },
+        { value: "alby", text: "Alby" },
         { value: "bitboxapp", text: "BitBoxApp" },
         { value: "blockstream-green", text: "Blockstream Green (Android)" },
         { value: "bluewallet", text: "BlueWallet" },

From 84a003b14e662f7fbbcac3c0d6267a2d3422be34 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 5 Apr 2022 17:34:56 -0600
Subject: [PATCH 5/5] keep cert

---
 src/components/ConnectWallet/Wallets/Alby.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ConnectWallet/Wallets/Alby.vue b/src/components/ConnectWallet/Wallets/Alby.vue
index a4eaba11..c5ce84de 100644
--- a/src/components/ConnectWallet/Wallets/Alby.vue
+++ b/src/components/ConnectWallet/Wallets/Alby.vue
@@ -18,7 +18,7 @@
         Copy this value into the
         <span class="font-weight-bold">"lndconnect REST URL"</span>.
         <input-copy
-          :value="urls.lnd.restTor.replace(/cert=(.*)&/gm, '')"
+          :value="urls.lnd.restTor"
           auto-width
         ></input-copy>
       </step>