From 5da71ff4ffedbd0b09ad1e1ef28e3c9e9b8117bb Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Mon, 5 Apr 2021 22:27:08 +0800
Subject: [PATCH] code refactor

---
 src/views/mobile/ExchangeRates.vue          | 2 +-
 src/views/mobile/Home.vue                   | 2 +-
 src/views/mobile/Signup.vue                 | 6 +++---
 src/views/mobile/accounts/Edit.vue          | 4 ++--
 src/views/mobile/accounts/List.vue          | 2 +-
 src/views/mobile/statistics/Transaction.vue | 2 +-
 src/views/mobile/transactions/Edit.vue      | 2 +-
 src/views/mobile/transactions/List.vue      | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/mobile/ExchangeRates.vue b/src/views/mobile/ExchangeRates.vue
index a08c96aa..d97d7dd3 100644
--- a/src/views/mobile/ExchangeRates.vue
+++ b/src/views/mobile/ExchangeRates.vue
@@ -56,7 +56,7 @@ export default {
         const self = this;
 
         return {
-            baseCurrency: self.$store.getters.currentUserDefaultCurrency || self.$t('default.currency'),
+            baseCurrency: self.$store.getters.currentUserDefaultCurrency,
             updating: false
         };
     },
diff --git a/src/views/mobile/Home.vue b/src/views/mobile/Home.vue
index a70c8d98..17a8c349 100644
--- a/src/views/mobile/Home.vue
+++ b/src/views/mobile/Home.vue
@@ -186,7 +186,7 @@ export default {
             return this.$store.state.transactionOverview;
         },
         defaultCurrency() {
-            return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency');
+            return this.$store.getters.currentUserDefaultCurrency;
         },
         firstDayOfWeek() {
             if (this.$utilities.isNumber(this.$store.getters.currentUserFirstDayOfWeek)) {
diff --git a/src/views/mobile/Signup.vue b/src/views/mobile/Signup.vue
index 1025370f..7eb7476f 100644
--- a/src/views/mobile/Signup.vue
+++ b/src/views/mobile/Signup.vue
@@ -197,7 +197,7 @@ export default {
                 confirmPassword: '',
                 email: '',
                 nickname: '',
-                defaultCurrency: self.$t('default.currency'),
+                defaultCurrency: self.$store.state.defaultSetting.currency,
                 firstDayOfWeek: self.$constants.datetime.allWeekDays[self.$t('default.firstDayOfWeek')] ? self.$constants.datetime.allWeekDays[self.$t('default.firstDayOfWeek')].type : 0
             },
             submitting: false,
@@ -227,13 +227,13 @@ export default {
                 return this.$i18n.locale;
             },
             set: function (value) {
-                const isCurrencyDefault = this.user.defaultCurrency === this.$t('default.currency');
+                const isCurrencyDefault = this.user.defaultCurrency === this.$store.state.defaultSetting.currency;
                 const isFirstWeekDayDefault = this.user.firstDayOfWeek === (this.$constants.datetime.allWeekDays[this.$t('default.firstDayOfWeek')] ? this.$constants.datetime.allWeekDays[this.$t('default.firstDayOfWeek')].type : 0);
 
                 this.$locale.setLanguage(value);
 
                 if (isCurrencyDefault) {
-                    this.user.defaultCurrency = this.$t('default.currency');
+                    this.user.defaultCurrency = this.$store.state.defaultSetting.currency;
                 }
 
                 if (isFirstWeekDayDefault) {
diff --git a/src/views/mobile/accounts/Edit.vue b/src/views/mobile/accounts/Edit.vue
index 34178386..0ad0fbaf 100644
--- a/src/views/mobile/accounts/Edit.vue
+++ b/src/views/mobile/accounts/Edit.vue
@@ -327,7 +327,7 @@ export default {
                 name: '',
                 icon: self.$constants.icons.defaultAccountIconId,
                 color: self.$constants.colors.defaultAccountColor,
-                currency: self.$store.getters.currentUserDefaultCurrency || self.$t('default.currency'),
+                currency: self.$store.getters.currentUserDefaultCurrency,
                 balance: 0,
                 comment: '',
                 visible: true,
@@ -461,7 +461,7 @@ export default {
                 name: '',
                 icon: self.account.icon,
                 color: self.account.color,
-                currency: self.$store.getters.currentUserDefaultCurrency || self.$t('default.currency'),
+                currency: self.$store.getters.currentUserDefaultCurrency,
                 balance: 0,
                 comment: '',
                 visible: true,
diff --git a/src/views/mobile/accounts/List.vue b/src/views/mobile/accounts/List.vue
index 7661d81f..84dd62cb 100644
--- a/src/views/mobile/accounts/List.vue
+++ b/src/views/mobile/accounts/List.vue
@@ -220,7 +220,7 @@ export default {
     },
     computed: {
         defaultCurrency() {
-            return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency');
+            return this.$store.getters.currentUserDefaultCurrency;
         },
         allAccountCategories() {
             return this.$constants.account.allCategories;
diff --git a/src/views/mobile/statistics/Transaction.vue b/src/views/mobile/statistics/Transaction.vue
index 66a86cc2..982f5d4d 100644
--- a/src/views/mobile/statistics/Transaction.vue
+++ b/src/views/mobile/statistics/Transaction.vue
@@ -263,7 +263,7 @@ export default {
     },
     computed: {
         defaultCurrency() {
-            return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency');
+            return this.$store.getters.currentUserDefaultCurrency;
         },
         firstDayOfWeek() {
             if (this.$utilities.isNumber(this.$store.getters.currentUserFirstDayOfWeek)) {
diff --git a/src/views/mobile/transactions/Edit.vue b/src/views/mobile/transactions/Edit.vue
index 488aca80..e269ef54 100644
--- a/src/views/mobile/transactions/Edit.vue
+++ b/src/views/mobile/transactions/Edit.vue
@@ -347,7 +347,7 @@ export default {
             }
         },
         defaultCurrency() {
-            return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency');
+            return this.$store.getters.currentUserDefaultCurrency;
         },
         defaultTimezoneOffset() {
             return this.$locale.defaultTimezoneOffset;
diff --git a/src/views/mobile/transactions/List.vue b/src/views/mobile/transactions/List.vue
index 20eab27d..8740d318 100644
--- a/src/views/mobile/transactions/List.vue
+++ b/src/views/mobile/transactions/List.vue
@@ -528,7 +528,7 @@ export default {
                 }
             }
 
-            return this.$store.getters.currentUserDefaultCurrency || this.$t('default.currency');
+            return this.$store.getters.currentUserDefaultCurrency;
         },
         currentTimezoneOffsetMinutes() {
             return this.$utilities.getTimezoneOffsetMinutes();