From baba28280ccbfbae241bd07db3624c945176bc3f Mon Sep 17 00:00:00 2001
From: MaysWind <i@mayswind.net>
Date: Fri, 27 Nov 2020 22:34:47 +0800
Subject: [PATCH] set default currency display mode to symbol

---
 src/filters/currency.js       | 12 ++++++------
 src/lib/settings.js           |  2 +-
 src/views/mobile/Settings.vue |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/filters/currency.js b/src/filters/currency.js
index 7772e4cf..19cd5e30 100644
--- a/src/filters/currency.js
+++ b/src/filters/currency.js
@@ -45,12 +45,7 @@ export default function ({i18n}, value, currencyCode) {
 
     const currencyDisplayMode = settings.getCurrencyDisplayMode();
 
-    if (currencyDisplayMode === 'code') {
-        return `${value} ${currencyCode}`;
-    } else if (currencyDisplayMode === 'name') {
-        const currencyName = i18n.t(`currency.${currencyCode}`);
-        return `${value} ${currencyName}`;
-    } else if (currencyDisplayMode === 'symbol') {
+    if (currencyDisplayMode === 'symbol') {
         const currencyInfo = currency.all[currencyCode];
         let currencySymbol = currency.defaultCurrencySymbol;
 
@@ -64,6 +59,11 @@ export default function ({i18n}, value, currencyCode) {
             amount: value,
             symbol: currencySymbol
         });
+    } else if (currencyDisplayMode === 'code') {
+        return `${value} ${currencyCode}`;
+    } else if (currencyDisplayMode === 'name') {
+        const currencyName = i18n.t(`currency.${currencyCode}`);
+        return `${value} ${currencyName}`;
     } else {
         return value;
     }
diff --git a/src/lib/settings.js b/src/lib/settings.js
index f71056ef..5b4bf898 100644
--- a/src/lib/settings.js
+++ b/src/lib/settings.js
@@ -10,7 +10,7 @@ const defaultSettings = {
     applicationLockWebAuthn: false,
     autoUpdateExchangeRatesData: true,
     thousandsSeparator: true,
-    currencyDisplayMode: 'code', // or 'none' or 'name' or 'symbol'
+    currencyDisplayMode: 'symbol', // or 'none' or 'code' or 'name'
     showAccountBalance: true,
     animate: false,
     autoDarkMode: true
diff --git a/src/views/mobile/Settings.vue b/src/views/mobile/Settings.vue
index 7afc19d7..f3319b04 100644
--- a/src/views/mobile/Settings.vue
+++ b/src/views/mobile/Settings.vue
@@ -49,9 +49,9 @@
                         smart-select :smart-select-params="{ openIn: 'sheet', closeOnSelect: true, sheetCloseLinkText: $t('Done') }">
                         <select v-model="currencyDisplayMode">
                             <option value="none">{{ $t('None') }}</option>
+                            <option value="symbol">{{ $t('Currency Symbol') }}</option>
                             <option value="code">{{ $t('Currency Code') }}</option>
                             <option value="name">{{ $t('Currency Name') }}</option>
-                            <option value="symbol">{{ $t('Currency Symbol') }}</option>
                         </select>
                     </f7-list-item>