Merge branch 'master' into simon/add-4y

frontend/src/app/services/price.service.ts

@@ -89,7 +89,7 @@ export class PriceService {
       return this.singlePriceObservable$.pipe(
         map((conversion) => {
           if (conversion.prices.length <= 0) {
-            return this.getEmptyPrice();
+            return undefined;
           }
           return {
             price: {
@@ -113,7 +113,7 @@ export class PriceService {
 
       return this.priceObservable$.pipe(
         map((conversion) => {
-          if (!blockTimestamp) {
+          if (!blockTimestamp || !conversion) {
             return undefined;
           }