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

2023-03-07 19:00:27 +09:00
parent abd74dc87e 6f376f8687
commit 761cd12978
80 changed files with 3930 additions and 2945 deletions
--- a/frontend/src/app/services/price.service.ts
+++ b/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;
          }