From 2d37fb6b7390f370b4fffa4442b4f79f308addd6 Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@thomasbutton.com>
Date: Thu, 20 Jun 2019 18:55:03 +0200
Subject: [PATCH] fix issue with main currency use & refresh

---
 .../android/ui/fragment/CalendarFragment.kt           |  7 +++++--
 .../android/util/extensions/CurrencyExtensions.kt     | 11 -----------
 .../android/util/extensions/NumbersExtension.kt       |  4 +++-
 3 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 app/src/main/java/net/pokeranalytics/android/util/extensions/CurrencyExtensions.kt

diff --git a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
index 957e5baf..ca1eb5a7 100644
--- a/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
+++ b/app/src/main/java/net/pokeranalytics/android/ui/fragment/CalendarFragment.kt
@@ -85,10 +85,13 @@ class CalendarFragment : RealmFragment(), CoroutineScope, StaticRowRepresentable
 		super.onViewCreated(view, savedInstanceState)
 		initData()
 		initUI()
-
-		launchStatComputation()
 	}
 
+    override fun onResume() {
+        super.onResume()
+        launchStatComputation()
+    }
+
 	override fun adapterRows(): List<RowRepresentable>? {
 		return rows
 	}
diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/CurrencyExtensions.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/CurrencyExtensions.kt
deleted file mode 100644
index baca88f7..00000000
--- a/app/src/main/java/net/pokeranalytics/android/util/extensions/CurrencyExtensions.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package net.pokeranalytics.android.util.extensions
-
-import net.pokeranalytics.android.util.UserDefaults
-import java.util.*
-
-val Currency.locale : Locale
-    get() =
-        UserDefaults.availableCurrencyLocales.filter {
-            Currency.getInstance(it).currencyCode == this.currencyCode
-        }.firstOrNull() ?: Locale.getDefault()
-
diff --git a/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt
index 016edaca..35f91407 100644
--- a/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt
+++ b/app/src/main/java/net/pokeranalytics/android/util/extensions/NumbersExtension.kt
@@ -55,7 +55,9 @@ fun Double.toCurrency(currency: Currency? = null): String {
 	val currencyFormatter = NumberFormat.getCurrencyInstance(Locale.getDefault())
 	currency?.let {
 		currencyFormatter.currency = currency
-	}
+	} ?: run {
+        currencyFormatter.currency = UserDefaults.currency
+    }
 
 	currencyFormatter.maximumFractionDigits = 2
 	currencyFormatter.minimumFractionDigits = 0