Merge pull request #5333 from gitcoinco/fix-tip-test

fix broken tip test
gitcoinco · Oct 18, 2019 · 1e4ab6b · 1e4ab6b
2 parents ff3cb70 + ec33305
commit 1e4ab6b
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/economy/utils.py b/app/economy/utils.py
@@ -61,13 +61,15 @@ def convert_amount(from_amount, from_currency, to_currency, timestamp=None):
     if to_currency in settings.STABLE_COINS:
         to_currency = 'USDT'
 
-    
+
     if timestamp:
         conversion_rate = ConversionRate.objects.filter(
             from_currency=from_currency,
             to_currency=to_currency,
             timestamp__lte=timestamp
         ).order_by('-timestamp').first()
+        if not conversion_rate:
+            return convert_amount(from_amount, from_currency, to_currency)
     else:
         conversion_rate = ConversionRate.objects.filter(
             from_currency=from_currency,