Merge pull request #3504

8236277 main: simplify fiat ticker code (selsta)

1 files changed, 3 insertions, 7 deletions

diff --git a/main.qml b/main.qml
index 972f812c..010c25f4 100644
--- a/main.qml
+++ b/main.qml
@@ -99,8 +99,7 @@ ApplicationWindow {
     property bool themeTransition: false
 
     // fiat price conversion
-    property real fiatPriceXMRUSD: 0
-    property real fiatPriceXMREUR: 0
+    property real fiatPrice: 0
     property var fiatPriceAPIs: {
         return {
             "kraken": {
@@ -1201,10 +1200,7 @@ ApplicationWindow {
             return;
         }
 
-        if(persistentSettings.fiatPriceCurrency === "xmrusd")
-            appWindow.fiatPriceXMRUSD = ticker;
-        else if(persistentSettings.fiatPriceCurrency === "xmreur")
-            appWindow.fiatPriceXMREUR = ticker;
+        appWindow.fiatPrice = ticker;
 
         appWindow.updateBalance();
     }
@@ -1243,7 +1239,7 @@ ApplicationWindow {
     }
 
     function fiatApiConvertToFiat(amount) {
-        var ticker = persistentSettings.fiatPriceCurrency === "xmrusd" ? appWindow.fiatPriceXMRUSD : appWindow.fiatPriceXMREUR;
+        const ticker = appWindow.fiatPrice;
         if(ticker <= 0){
             fiatApiError("Invalid ticker value: " + ticker);
             return "?.??";