From e598f9126cc1eb21a06933c38df53a7fe7002310 Mon Sep 17 00:00:00 2001
From: Peng Zhong <peng@nylira.com>
Date: Fri, 12 Jan 2018 14:03:57 +0900
Subject: [PATCH 1/2] init

---
 .../renderer/components/wallet/LiTransaction.vue   | 14 ++++++++++++--
 .../components/wallet/PageTransactions.vue         |  6 ++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/renderer/components/wallet/LiTransaction.vue b/app/src/renderer/components/wallet/LiTransaction.vue
index 5f56747cd4..682f3203f7 100644
--- a/app/src/renderer/components/wallet/LiTransaction.vue
+++ b/app/src/renderer/components/wallet/LiTransaction.vue
@@ -1,6 +1,5 @@
 <template lang='pug'>
-.ni-li-tx.ni-li-tx-sent(v-if="sent" @click="() => devMode && viewTransaction()")
-  .tx-icon: i.material-icons remove_circle
+mixin tx-container-sent
   .tx-container
     .tx-element.tx-coins
       .tx-coin(v-for='coin in coinsSent')
@@ -9,6 +8,14 @@
     .tx-element.tx-date(v-if="devMode") {{ date }}
     .tx-element.tx-address {{ receiver }}
 
+.ni-li-tx(v-if="sentSelf" @click="() => devMode && viewTransaction()")
+  .tx-icon: i.material-icons swap_horiz
+  +tx-container-sent
+
+.ni-li-tx.ni-li-tx-sent(v-else-if="sent" @click="() => devMode && viewTransaction()")
+  .tx-icon: i.material-icons remove_circle
+  +tx-container-sent
+
 .ni-li-tx.ni-li-tx-received(v-else @click="() => devMode && viewTransaction()")
   .tx-icon: i.material-icons add_circle
   .tx-container
@@ -27,6 +34,9 @@ export default {
   name: 'ni-li-tx',
   computed: {
     // TODO: sum relevant inputs/outputs
+    sentSelf () {
+      return this.transactionValue.tx.inputs[0].sender === this.transactionValue.tx.outputs[0].receiver
+    },
     sent () {
       return this.transactionValue.tx.inputs[0].sender === this.address
     },
diff --git a/app/src/renderer/components/wallet/PageTransactions.vue b/app/src/renderer/components/wallet/PageTransactions.vue
index ef009aafee..f3c056be5f 100644
--- a/app/src/renderer/components/wallet/PageTransactions.vue
+++ b/app/src/renderer/components/wallet/PageTransactions.vue
@@ -19,7 +19,7 @@ page(title='Transactions')
 
 <script>
 import { mapGetters } from 'vuex'
-import { includes, orderBy } from 'lodash'
+import { includes, orderBy, uniqBy } from 'lodash'
 import Mousetrap from 'mousetrap'
 import DataEmptySearch from 'common/NiDataEmptySearch'
 import DataEmptyTx from 'common/NiDataEmptyTx'
@@ -42,7 +42,8 @@ export default {
   computed: {
     ...mapGetters(['filters', 'transactions', 'wallet', 'config']),
     orderedTransactions () {
-      return orderBy(this.transactions, [this.sort.property], [this.sort.order])
+      let list = orderBy(this.transactions, [this.sort.property], [this.sort.order])
+      return uniqBy(list, 'time') // filter out duplicate tx to self
     },
     filteredTransactions () {
       let query = this.filters.transactions.search.query
@@ -66,6 +67,7 @@ export default {
     }
   },
   mounted () {
+    console.log(this.filteredTransactions)
     Mousetrap.bind(['command+f', 'ctrl+f'], () => this.setSearch(true))
     Mousetrap.bind('esc', () => this.setSearch(false))
   }

From 9009fcff79ad06ac8f9a1fcd9426330456ad0314 Mon Sep 17 00:00:00 2001
From: Peng Zhong <peng@nylira.com>
Date: Fri, 12 Jan 2018 14:09:06 +0900
Subject: [PATCH 2/2] remove console.log

---
 app/src/renderer/components/wallet/PageTransactions.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/renderer/components/wallet/PageTransactions.vue b/app/src/renderer/components/wallet/PageTransactions.vue
index f3c056be5f..c64c6931f3 100644
--- a/app/src/renderer/components/wallet/PageTransactions.vue
+++ b/app/src/renderer/components/wallet/PageTransactions.vue
@@ -67,7 +67,6 @@ export default {
     }
   },
   mounted () {
-    console.log(this.filteredTransactions)
     Mousetrap.bind(['command+f', 'ctrl+f'], () => this.setSearch(true))
     Mousetrap.bind('esc', () => this.setSearch(false))
   }