From 9212ed005753f4500b74d24d4fb292f756867532 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 11 Jan 2021 23:42:43 +0800
Subject: [PATCH] show destination amount for transfer-in transaction

---
 src/store/transaction.js               | 16 +++++++++++-----
 src/views/mobile/transactions/List.vue |  8 ++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/store/transaction.js b/src/store/transaction.js
index d900ff43..a651ee86 100644
--- a/src/store/transaction.js
+++ b/src/store/transaction.js
@@ -298,14 +298,20 @@ export function calculateMonthTotalAmount(state, transactionMonthList, defaultCu
     for (let i = 0; i < transactionMonthList.items.length; i++) {
         const transaction = transactionMonthList.items[i];
 
-        if (!transaction.sourceAccount) {
+        let amount = transaction.sourceAmount;
+        let account = transaction.sourceAccount;
+
+        if (accountId && transaction.destinationAccount && transaction.destinationAccount.id === accountId) {
+            amount = transaction.destinationAmount;
+            account = transaction.destinationAccount;
+        }
+
+        if (!account) {
             continue;
         }
 
-        let amount = transaction.sourceAmount;
-
-        if (transaction.sourceAccount.currency !== defaultCurrency) {
-            const balance = getExchangedAmount(state)(amount, transaction.sourceAccount.currency, defaultCurrency);
+        if (account.currency !== defaultCurrency) {
+            const balance = getExchangedAmount(state)(amount, account.currency, defaultCurrency);
 
             if (!utils.isNumber(balance)) {
                 if (transaction.type === transactionConstants.allTransactionTypes.Expense) {
diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue
index 9a83d59f..b428cb67 100644
--- a/src/views/mobile/transactions/List.vue
+++ b/src/views/mobile/transactions/List.vue
@@ -199,10 +199,10 @@
                                     <span v-if="transaction.sourceAccount && transaction.type === $constants.transaction.allTransactionTypes.Transfer && transaction.destinationAccount && transaction.sourceAccount.id !== transaction.destinationAccount.id">→</span>
                                     <span v-if="transaction.sourceAccount && transaction.type === $constants.transaction.allTransactionTypes.Transfer && transaction.destinationAccount && transaction.sourceAccount.id !== transaction.destinationAccount.id">{{ transaction.destinationAccount.name }}</span>
                                 </div>
-                                <div slot="after" class="transaction-amount" v-if="transaction.sourceAccount">
-                                    <span :class="{ 'text-color-teal': transaction.type === $constants.transaction.allTransactionTypes.Expense, 'text-color-red': transaction.type === $constants.transaction.allTransactionTypes.Income }">
-                                        {{ transaction.sourceAmount | currency(transaction.sourceAccount.currency) }}
-                                    </span>
+                                <div slot="after" class="transaction-amount" v-if="transaction.sourceAccount"
+                                     :class="{ 'text-color-teal': transaction.type === $constants.transaction.allTransactionTypes.Expense, 'text-color-red': transaction.type === $constants.transaction.allTransactionTypes.Income }">
+                                    <span v-if="!query.accountId || query.accountId === '0' || (transaction.sourceAccount && transaction.sourceAccount.id === query.accountId)">{{ transaction.sourceAmount | currency(transaction.sourceAccount.currency) }}</span>
+                                    <span v-else-if="query.accountId && query.accountId !== '0' && transaction.destinationAccount && transaction.destinationAccount.id === query.accountId">{{ transaction.destinationAmount | currency(transaction.destinationAccount.currency) }}</span>
                                 </div>
                                 <f7-swipeout-actions right>
                                     <f7-swipeout-button color="primary" close