Merge remote-tracking branch 'upstream/master' into stb

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,

app/kudos/templates/kudos_about.html

@@ -332,7 +332,7 @@ <h5 class="accordion">Who earns money when a new Kudos is created?</h5>
         <div class="mb-3 faq-item">
           <h5 class="accordion">How is Kudos' privacy managed?</h5>
           <div class="panel">
-            <p>When you send a kudos, you making an attestion about an attribute of the person who controls a web3 address.</p>
+            <p>When you send a kudos, you are making an attestation about an attribute of the person who controls a web3 address.</p>
             <p>Technically speaking, the attestation is an Ethereum transaction of a <strong>non-fungible token (NFT)</strong> being sent from a <strong>sender</strong> to a <strong>receiver</strong></p>
             <p>When you send a kudos through the Gitcoin UI, you are sending the NFT to a secure proxy web3 address.</p>
             <p>The recipient can decide to accept it or reject it.</p>
@@ -439,5 +439,5 @@ <h5 class="accordion">I have another question and it's not listed here.</h5>
         setInterval(load_kudos_card_images, 300);
       });
     </script>
-    
+
   </body>