WIP

Author: Jon-edge

src/components/scenes/CoinRankingScene.tsx

@@ -143,7 +143,7 @@ const CoinRankingComponent = (props: Props) => {
   })
 
   React.useEffect(() => {
-    if (lastSceneFiat !== coingeckoFiat) {
+    if (lastSceneFiat != null && lastSceneFiat !== coingeckoFiat) {
       // Clear cache if we changed the fiat while outside of this scene
       debugLog(LOG_COINRANK, 'Clearing coinRankingDatas cache')
       coinRanking.coinRankingDatas = []
@@ -230,7 +230,7 @@ const CoinRankingComponent = (props: Props) => {
     return () => {
       // Reset related query state when this effect is unmounted (coingeckoFiat
       // changed), but the scene is still mounted:
-      if (mounted.current) {
+      if (coingeckoFiat !== lastSceneFiat) {
         debugLog(LOG_COINRANK, `Clearing coinRankingDatas cache for new fiat: ${coingeckoFiat}`)
         clearTimeout(timeoutId)
         loopAbort()