From 291b5c149350665bdda040d373a51488109bf348 Mon Sep 17 00:00:00 2001
From: Jordan Bibla <jbibla@gmail.com>
Date: Fri, 29 Dec 2017 18:11:06 -0500
Subject: [PATCH 1/2] clicking a balance will go to the send page with that
 denom selected, balance page displays balances and denominations on the
 network as separate lists

---
 .../components/wallet/PageBalances.vue        |  24 +-
 .../renderer/components/wallet/PageSend.vue   |   3 +-
 app/src/renderer/routes.js                    |   2 +-
 .../__snapshots__/PageBalances.spec.js.snap   | 294 ++++++++++++------
 4 files changed, 225 insertions(+), 98 deletions(-)

diff --git a/app/src/renderer/components/wallet/PageBalances.vue b/app/src/renderer/components/wallet/PageBalances.vue
index d638eff078..2b5eb9895e 100644
--- a/app/src/renderer/components/wallet/PageBalances.vue
+++ b/app/src/renderer/components/wallet/PageBalances.vue
@@ -14,14 +14,22 @@ page(title='Balance')
     li-copy(:value="wallet.key.address")
 
   part(title="Denomination Balances")
-  data-empty(v-if="wallet.balances.length === 0")
-  data-empty-search(v-else-if="filteredBalances.length === 0")
-  list-item(
-    v-else
-    v-for="i in filteredBalances"
-    :key="i.denom"
-    :dt="i.denom.toUpperCase()"
-    :dd="i.amount")
+    data-empty(v-if="wallet.balances.length === 0")
+    data-empty-search(v-else-if="filteredBalances.length === 0")
+    list-item(
+      v-for="i in filteredBalances"
+      v-if="wallet.balances.length > 0 && i.amount > 0"
+      :key="i.denom"
+      :dt="i.denom.toUpperCase()"
+      :dd="i.amount"
+      :to="{name: 'send', params: {denom: i.denom}}")
+
+  part(title="Network Denominations")
+    list-item(
+      v-for="i in filteredBalances"
+      v-if="i.amount === 0"
+      :key="i.denom"
+      :dt="i.denom.toUpperCase()")
 </template>
 
 <script>
diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
index 1fb6d59dbb..362aae6ecf 100644
--- a/app/src/renderer/components/wallet/PageSend.vue
+++ b/app/src/renderer/components/wallet/PageSend.vue
@@ -8,7 +8,7 @@ page(title='Send')
         field-id='send-denomination' field-label='Denomination')
         field#send-denomination(
           type="select"
-          v-model="fields.denom"
+          v-model="fields.denom || denom"
           :options="denominations"
           placeholder="Select token...")
         form-msg(name='Denomination' type='required' v-if='!$v.fields.denom.required')
@@ -121,6 +121,7 @@ export default {
     },
     ...mapActions(['walletSend'])
   },
+  props: ['denom'],
   mounted () {
     if (this.denominations.length === 1) {
       this.fields.denom = this.denominations[0].value
diff --git a/app/src/renderer/routes.js b/app/src/renderer/routes.js
index 8caaa48720..676d8275a6 100644
--- a/app/src/renderer/routes.js
+++ b/app/src/renderer/routes.js
@@ -68,7 +68,7 @@ export default [
 
   // WALLET
   { path: '/', name: 'balances', component: wallet('Balances') },
-  { path: '/wallet/send', name: 'send', component: wallet('Send') },
+  { path: '/wallet/send', name: 'send', props: true, component: wallet('Send') },
   { path: '/wallet/transactions', name: 'transactions', component: wallet('Transactions') },
 
   // 404
diff --git a/test/unit/specs/__snapshots__/PageBalances.spec.js.snap b/test/unit/specs/__snapshots__/PageBalances.spec.js.snap
index 7ee89fdb7b..4527220764 100644
--- a/test/unit/specs/__snapshots__/PageBalances.spec.js.snap
+++ b/test/unit/specs/__snapshots__/PageBalances.spec.js.snap
@@ -171,63 +171,122 @@ exports[`PageBalances has the expected html structure 1`] = `
         </header>
         <main
           class="ni-part-main"
-        />
-      </div>
-    </section>
-    <div
-      class="ni-li proposal-enter proposal-enter-active"
-    >
-      <div
-        class="ni-li-container"
-      >
-        <div
-          class="ni-li-thumb"
         >
           <!---->
-        </div>
-        <div
-          class="ni-li-dl"
-        >
-          <div
-            class="ni-li-dt"
+          <a
+            class="ni-li ni-li-link proposal-enter proposal-enter-active"
+            href="#/wallet/send"
           >
-            FERMION
-          </div>
-          <div
-            class="ni-li-dd"
+            <div
+              class="ni-li-container"
+            >
+              <div
+                class="ni-li-thumb"
+              >
+                <!---->
+              </div>
+              <div
+                class="ni-li-dl"
+              >
+                <div
+                  class="ni-li-dt"
+                >
+                  FERMION
+                </div>
+                <div
+                  class="ni-li-dd"
+                >
+                  456
+                </div>
+              </div>
+              <div
+                class="ni-li-icon"
+              >
+                <i
+                  class="material-icons inactive"
+                >
+                  chevron_right
+                </i>
+                <i
+                  class="material-icons active"
+                >
+                  my_location
+                </i>
+              </div>
+            </div>
+          </a>
+          <a
+            class="ni-li ni-li-link proposal-enter proposal-enter-active"
+            href="#/wallet/send"
           >
-            456
-          </div>
-        </div>
+            <div
+              class="ni-li-container"
+            >
+              <div
+                class="ni-li-thumb"
+              >
+                <!---->
+              </div>
+              <div
+                class="ni-li-dl"
+              >
+                <div
+                  class="ni-li-dt"
+                >
+                  ATOM
+                </div>
+                <div
+                  class="ni-li-dd"
+                >
+                  123
+                </div>
+              </div>
+              <div
+                class="ni-li-icon"
+              >
+                <i
+                  class="material-icons inactive"
+                >
+                  chevron_right
+                </i>
+                <i
+                  class="material-icons active"
+                >
+                  my_location
+                </i>
+              </div>
+            </div>
+          </a>
+        </main>
       </div>
-    </div>
-    <div
-      class="ni-li proposal-enter proposal-enter-active"
+    </section>
+    <section
+      class="ni-part"
     >
       <div
-        class="ni-li-container"
+        class="ni-part-container"
       >
-        <div
-          class="ni-li-thumb"
-        >
-          <!---->
-        </div>
-        <div
-          class="ni-li-dl"
+        <header
+          class="ni-part-header"
         >
           <div
-            class="ni-li-dt"
-          >
-            ATOM
-          </div>
-          <div
-            class="ni-li-dd"
+            class="ni-part-header-container"
           >
-            123
+            <div
+              class="ni-part-title h5"
+            >
+              Network Denominations
+            </div>
+            <menu
+              class="ni-part-menu"
+            />
           </div>
-        </div>
+        </header>
+        <main
+          class="ni-part-main"
+        />
       </div>
-    </div>
+    </section>
   </main>
 </div>
 `;
@@ -403,63 +462,122 @@ exports[`PageBalances should filter the balances 1`] = `
         </header>
         <main
           class="ni-part-main"
-        />
-      </div>
-    </section>
-    <div
-      class="ni-li"
-    >
-      <div
-        class="ni-li-container"
-      >
-        <div
-          class="ni-li-thumb"
         >
           <!---->
-        </div>
-        <div
-          class="ni-li-dl"
-        >
-          <div
-            class="ni-li-dt"
+          <a
+            class="ni-li ni-li-link"
+            href="#/wallet/send"
           >
-            FERMION
-          </div>
-          <div
-            class="ni-li-dd"
+            <div
+              class="ni-li-container"
+            >
+              <div
+                class="ni-li-thumb"
+              >
+                <!---->
+              </div>
+              <div
+                class="ni-li-dl"
+              >
+                <div
+                  class="ni-li-dt"
+                >
+                  FERMION
+                </div>
+                <div
+                  class="ni-li-dd"
+                >
+                  456
+                </div>
+              </div>
+              <div
+                class="ni-li-icon"
+              >
+                <i
+                  class="material-icons inactive"
+                >
+                  chevron_right
+                </i>
+                <i
+                  class="material-icons active"
+                >
+                  my_location
+                </i>
+              </div>
+            </div>
+          </a>
+          <a
+            class="ni-li ni-li-link"
+            href="#/wallet/send"
           >
-            456
-          </div>
-        </div>
+            <div
+              class="ni-li-container"
+            >
+              <div
+                class="ni-li-thumb"
+              >
+                <!---->
+              </div>
+              <div
+                class="ni-li-dl"
+              >
+                <div
+                  class="ni-li-dt"
+                >
+                  ATOM
+                </div>
+                <div
+                  class="ni-li-dd"
+                >
+                  123
+                </div>
+              </div>
+              <div
+                class="ni-li-icon"
+              >
+                <i
+                  class="material-icons inactive"
+                >
+                  chevron_right
+                </i>
+                <i
+                  class="material-icons active"
+                >
+                  my_location
+                </i>
+              </div>
+            </div>
+          </a>
+        </main>
       </div>
-    </div>
-    <div
-      class="ni-li"
+    </section>
+    <section
+      class="ni-part"
     >
       <div
-        class="ni-li-container"
+        class="ni-part-container"
       >
-        <div
-          class="ni-li-thumb"
-        >
-          <!---->
-        </div>
-        <div
-          class="ni-li-dl"
+        <header
+          class="ni-part-header"
         >
           <div
-            class="ni-li-dt"
-          >
-            ATOM
-          </div>
-          <div
-            class="ni-li-dd"
+            class="ni-part-header-container"
           >
-            123
+            <div
+              class="ni-part-title h5"
+            >
+              Network Denominations
+            </div>
+            <menu
+              class="ni-part-menu"
+            />
           </div>
-        </div>
+        </header>
+        <main
+          class="ni-part-main"
+        />
       </div>
-    </div>
+    </section>
   </main>
 </div>
 `;

From 119c7fa8ff0904e5326e91a807ce241e35013dce Mon Sep 17 00:00:00 2001
From: Fabian <frznhope@gmail.com>
Date: Tue, 2 Jan 2018 12:00:46 +0100
Subject: [PATCH 2/2] set denom in sendpage from property

---
 app/src/renderer/components/wallet/PageSend.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/src/renderer/components/wallet/PageSend.vue b/app/src/renderer/components/wallet/PageSend.vue
index 362aae6ecf..34d8b7543a 100644
--- a/app/src/renderer/components/wallet/PageSend.vue
+++ b/app/src/renderer/components/wallet/PageSend.vue
@@ -8,7 +8,7 @@ page(title='Send')
         field-id='send-denomination' field-label='Denomination')
         field#send-denomination(
           type="select"
-          v-model="fields.denom || denom"
+          v-model="fields.denom"
           :options="denominations"
           placeholder="Select token...")
         form-msg(name='Denomination' type='required' v-if='!$v.fields.denom.required')
@@ -123,8 +123,8 @@ export default {
   },
   props: ['denom'],
   mounted () {
-    if (this.denominations.length === 1) {
-      this.fields.denom = this.denominations[0].value
+    if (this.denom) {
+      this.fields.denom = this.denom
     }
   },
   validations: () => ({