From 22c80f4879125a8612e2b41d28d7cc2bf9a4fe98 Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Thu, 7 Jan 2021 00:13:17 +0800
Subject: [PATCH] optimize user experience

---
 src/views/mobile/transactions/Edit.vue | 11 ++++++++++-
 src/views/mobile/transactions/List.vue |  8 ++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/views/mobile/transactions/Edit.vue b/src/views/mobile/transactions/Edit.vue
index 55019068..2156a20c 100644
--- a/src/views/mobile/transactions/Edit.vue
+++ b/src/views/mobile/transactions/Edit.vue
@@ -237,13 +237,22 @@
 export default {
     data() {
         const self = this;
+        const query = self.$f7route.query;
         const now = new Date();
 
+        let defaultType = self.$constants.transaction.allTransactionTypes.Expense;
+
+        if (query.type === self.$constants.transaction.allTransactionTypes.Income.toString()) {
+            defaultType = self.$constants.transaction.allTransactionTypes.Income;
+        } else if (query.type === self.$constants.transaction.allTransactionTypes.Transfer.toString()) {
+            defaultType = self.$constants.transaction.allTransactionTypes.Transfer;
+        }
+
         return {
             mode: 'add',
             editTransactionId: null,
             transaction: {
-                type: self.$constants.transaction.allTransactionTypes.Expense,
+                type: defaultType,
                 unixTime: self.$utilities.getUnixTime(now),
                 time: self.$utilities.formatDate(now, 'YYYY-MM-DDTHH:mm'),
                 expenseCategory: '',
diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue
index 33cb387c..1222f904 100644
--- a/src/views/mobile/transactions/List.vue
+++ b/src/views/mobile/transactions/List.vue
@@ -10,7 +10,7 @@
             <f7-nav-title :title="$t('Transaction List')"></f7-nav-title>
             <f7-nav-right class="navbar-compact-icons">
                 <f7-link icon-f7="search" class="searchbar-enable" data-searchbar=".searchbar-keyword"></f7-link>
-                <f7-link icon-f7="plus" :href="'/transaction/add?type=' + query.type + '&categoryId=' + query.categoryId + '&accountId=' + query.accountId"></f7-link>
+                <f7-link icon-f7="plus" :href="`/transaction/add?type=${query.type}&categoryId=${query.categoryId}&accountId=${query.accountId}`"></f7-link>
             </f7-nav-right>
 
             <f7-searchbar
@@ -155,7 +155,7 @@
                             <f7-list-item class="transaction-info" chevron-center
                                           v-for="(transaction, idx) in transactionMonthList.items"
                                           :key="transaction.id" :id="transaction | transactionDomId"
-                                          :link="transaction.type !== $constants.transaction.allTransactionTypes.ModifyBalance ? '/transaction/detail?id=' + transaction.id : null"
+                                          :link="transaction.type !== $constants.transaction.allTransactionTypes.ModifyBalance ? `/transaction/detail?id=${transaction.id}&type=${transaction.type}` : null"
                                           swipeout
                             >
                                 <div slot="media" class="display-flex no-padding-horizontal">
@@ -725,10 +725,10 @@ export default {
             this.reload(null);
         },
         duplicate(transaction) {
-            this.$f7router.navigate('/transaction/add?id=' + transaction.id);
+            this.$f7router.navigate(`/transaction/add?id=${transaction.id}&type=${transaction.type}`);
         },
         edit(transaction) {
-            this.$f7router.navigate('/transaction/edit?id=' + transaction.id);
+            this.$f7router.navigate(`/transaction/edit?id=${transaction.id}&type=${transaction.type}`);
         },
         remove(transaction, confirm) {
             const self = this;