From a59b9358cdcd3a6901ce07e5ddf408c1c87cb3ac Mon Sep 17 00:00:00 2001
From: Mayank <mayankchhabra9@gmail.com>
Date: Wed, 22 Apr 2020 17:25:21 +0530
Subject: [PATCH] open channel complete

---
 src/components/CardWidget.vue       |  1 +
 src/components/Channels/Channel.vue | 59 -----------------------------
 src/components/Channels/Open.vue    |  9 ++---
 src/views/Lightning.vue             |  9 ++---
 4 files changed, 8 insertions(+), 70 deletions(-)

diff --git a/src/components/CardWidget.vue b/src/components/CardWidget.vue
index 2f3433d..13fb976 100644
--- a/src/components/CardWidget.vue
+++ b/src/components/CardWidget.vue
@@ -48,6 +48,7 @@
             </template>
             <slot name="menu"></slot>
           </b-dropdown>
+          <slot name="header-right" v-else></slot>
         </div>
       </div>
       <div class="card-custom-body">
diff --git a/src/components/Channels/Channel.vue b/src/components/Channels/Channel.vue
index c0ba4f9..b9dc00a 100644
--- a/src/components/Channels/Channel.vue
+++ b/src/components/Channels/Channel.vue
@@ -9,35 +9,6 @@
             size="sm"
           >{{ getStatus(channel.type)['text'] }}</status>
           <div>
-            <!-- Outbound icon -->
-            <svg
-              width="19"
-              height="19"
-              viewBox="0 0 19 19"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-              v-if="channel.initiator"
-            >
-              <path
-                d="M7.06802 4.71946C6.76099 4.71224 6.50825 4.96178 6.50627 5.27413C6.50435 5.57592 6.7539 5.82865 7.05534 5.83022L12.7162 5.86616L4.81508 13.3568C4.59632 13.5735 4.59981 14.1376 4.81615 14.3568C5.03249 14.5759 5.59723 14.572 5.81634 14.3556L13.4988 6.6587L13.4576 12.3143C13.4609 12.6214 13.7108 12.8745 14.0122 12.876C14.3246 12.878 14.5777 12.6281 14.574 12.3214L14.6184 5.32036C14.6257 5.01333 14.3761 4.76059 14.0694 4.76427L7.06802 4.71946Z"
-                fill="#6c757d"
-              />
-            </svg>
-
-            <!-- inbound icon -->
-            <svg
-              width="18"
-              height="18"
-              viewBox="0 0 18 18"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-              v-else
-            >
-              <path
-                d="M13.5944 6.04611C13.6001 5.73904 13.3493 5.48755 13.0369 5.48712C12.7351 5.4867 12.4836 5.7375 12.4836 6.03895L12.4758 11.6999L4.94598 3.83615C4.72819 3.61848 4.16402 3.62477 3.94599 3.8422C3.72796 4.05963 3.73466 4.62433 3.95209 4.84236L11.6871 12.4864L6.03143 12.4733C5.72435 12.4782 5.47251 12.7293 5.47244 13.0308C5.47201 13.3431 5.72317 13.595 6.0299 13.5898L13.031 13.5994C13.3381 13.6051 13.5896 13.3543 13.5844 13.0476L13.5944 6.04611Z"
-                fill="#6c757d"
-              />
-            </svg>
             <span
               class="text-muted"
               style="margin-left: 2px;"
@@ -52,36 +23,6 @@
             size="sm"
           >{{ getStatus(channel.type)['text'] }}</status>
           <div>
-            <!-- Outbound icon -->
-            <svg
-              width="19"
-              height="19"
-              viewBox="0 0 19 19"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-              v-if="channel.initiator"
-            >
-              <path
-                d="M7.06802 4.71946C6.76099 4.71224 6.50825 4.96178 6.50627 5.27413C6.50435 5.57592 6.7539 5.82865 7.05534 5.83022L12.7162 5.86616L4.81508 13.3568C4.59632 13.5735 4.59981 14.1376 4.81615 14.3568C5.03249 14.5759 5.59723 14.572 5.81634 14.3556L13.4988 6.6587L13.4576 12.3143C13.4609 12.6214 13.7108 12.8745 14.0122 12.876C14.3246 12.878 14.5777 12.6281 14.574 12.3214L14.6184 5.32036C14.6257 5.01333 14.3761 4.76059 14.0694 4.76427L7.06802 4.71946Z"
-                fill="#6c757d"
-              />
-            </svg>
-
-            <!-- inbound icon -->
-            <svg
-              width="18"
-              height="18"
-              viewBox="0 0 18 18"
-              fill="none"
-              xmlns="http://www.w3.org/2000/svg"
-              v-else
-            >
-              <path
-                d="M13.5944 6.04611C13.6001 5.73904 13.3493 5.48755 13.0369 5.48712C12.7351 5.4867 12.4836 5.7375 12.4836 6.03895L12.4758 11.6999L4.94598 3.83615C4.72819 3.61848 4.16402 3.62477 3.94599 3.8422C3.72796 4.05963 3.73466 4.62433 3.95209 4.84236L11.6871 12.4864L6.03143 12.4733C5.72435 12.4782 5.47251 12.7293 5.47244 13.0308C5.47201 13.3431 5.72317 13.595 6.0299 13.5898L13.031 13.5994C13.3381 13.6051 13.5896 13.3543 13.5844 13.0476L13.5944 6.04611Z"
-                fill="#6c757d"
-              />
-            </svg>
-
             <small
               class="text-muted"
               style="margin-left: 2px;"
diff --git a/src/components/Channels/Open.vue b/src/components/Channels/Open.vue
index 61fc8bc..0fdaa82 100644
--- a/src/components/Channels/Open.vue
+++ b/src/components/Channels/Open.vue
@@ -2,10 +2,11 @@
   <form @submit.prevent="openChannel">
     <b-row>
       <b-col col cols="12" sm="6">
-        <label class="sr-onlsy" for="peer-connection">Peer connection code</label>
+        <label class="sr-onlsy" for="peer-connection">Peer address</label>
         <b-input
           id="peer-connection"
           class="mb-3 neu-input"
+          placeholder="pubkey@ip:port"
           type="text"
           size="lg"
           v-model="peerConnectionCode"
@@ -13,7 +14,7 @@
         ></b-input>
       </b-col>
       <b-col col cols="12" sm="6">
-        <label class="sr-onlsy" for="funding-amount">Channel funding amount</label>
+        <label class="sr-onlsy" for="funding-amount">Sats</label>
         <b-input
           id="funding-amount"
           class="mb-3 neu-input"
@@ -165,10 +166,8 @@ export default {
       if (this.feeTimeout) {
         clearTimeout(this.feeTimeout);
       }
-
-      this.error = "";
-
       this.feeTimeout = setTimeout(async () => {
+        this.error = "";
         if (this.fundingAmount) {
           const payload = {
             confTarget: 0,
diff --git a/src/views/Lightning.vue b/src/views/Lightning.vue
index 16a374c..7d36f69 100644
--- a/src/views/Lightning.vue
+++ b/src/views/Lightning.vue
@@ -106,6 +106,9 @@
       </b-col>
       <b-col col cols="12" md="6" xl="8">
         <card-widget header="Channels">
+          <template v-slot:header-right>
+            <b-button variant="outline-dark" size="sm" v-b-modal.open-channel-modal>+ Open Channel</b-button>
+          </template>
           <div class>
             <div class="px-3 px-sm-4">
               <b-row>
@@ -120,12 +123,6 @@
               </b-row>
             </div>
 
-            <b-button
-              class="mx-4"
-              variant="outline-primary"
-              v-b-modal.open-channel-modal
-            >Open Channel</b-button>
-
             <b-modal
               id="open-channel-modal"
               ref="open-channel-modal"