github
/
monero-gui
mirror of https://github.com/monero-project/monero-gui
1
Fork 0
Code Releases Activity

Merge pull request #3504 

8236277 main: simplify fiat ticker code (selsta)
This commit is contained in:
luigi1111 2021-07-06 11:42:09 -04:00
parent 8730743207 8236277906
commit 6e87e2cb5b
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
main.qml
View File

@ -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 "?.??";