Merge pull request #2001 from dusk-network/feature-1975

explorer: Fixed app failing to load on Safari

explorer/src/lib/market-data/MarketDataInfo.js

@@ -0,0 +1,53 @@
+import { compose, updateKey } from "lamb";
+
+/** @returns {MarketData} */
+const jsonToMarketData = compose(
+  updateKey("lastUpdate", (v) => new Date(v)),
+  JSON.parse
+);
+
+class MarketDataInfo {
+  /** @type {MarketData} */
+  #data;
+
+  /** @type {Date} */
+  #lastUpdate;
+
+  /** @param {string} json */
+  static parse(json) {
+    const { data, lastUpdate } = jsonToMarketData(json);
+
+    return new MarketDataInfo(data, lastUpdate);
+  }
+
+  /**
+   *
+   * @param {MarketData} data
+   * @param {Date} lastUpdate
+   */
+  constructor(data, lastUpdate) {
+    this.#data = data;
+    this.#lastUpdate = lastUpdate;
+  }
+
+  get data() {
+    return this.#data;
+  }
+
+  get lastUpdate() {
+    return this.#lastUpdate;
+  }
+
+  toJSON() {
+    return JSON.stringify(this.toStorageData());
+  }
+
+  toStorageData() {
+    return {
+      data: this.#data,
+      lastUpdate: this.#lastUpdate,
+    };
+  }
+}
+
+export default MarketDataInfo;

explorer/src/lib/market-data/__tests__/MarketDataInfo.spec.js

@@ -0,0 +1,40 @@
+import { describe, expect, it } from "vitest";
+
+import { MarketDataInfo } from "..";
+
+describe("MarketDataInfo", () => {
+  const marketData = {
+    currentPrice: {},
+    marketCap: {},
+  };
+  const now = new Date();
+  const marketDataInfo = new MarketDataInfo(marketData, now);
+
+  it("should expose the market data and the last update as read-only props", () => {
+    expect(() => {
+      // @ts-expect-error
+      marketDataInfo.data = {};
+    }).toThrow();
+
+    expect(() => {
+      // @ts-expect-error
+      marketDataInfo.lastUpdate = new Date(2010, 3, 4);
+    }).toThrow();
+
+    expect(marketDataInfo.data).toStrictEqual(marketData);
+    expect(marketDataInfo.lastUpdate).toBe(now);
+  });
+
+  it("should expose a method to convert the instance to JSON and a static method to parse it", () => {
+    const newMarketDataInfo = MarketDataInfo.parse(marketDataInfo.toJSON());
+
+    expect(newMarketDataInfo).toStrictEqual(marketDataInfo);
+  });
+
+  it("should expose a method to convert the data to the format used for storage", () => {
+    expect(marketDataInfo.toStorageData()).toStrictEqual({
+      data: marketData,
+      lastUpdate: now,
+    });
+  });
+});

explorer/src/lib/market-data/index.js

@@ -0,0 +1 @@
+export { default as MarketDataInfo } from "./MarketDataInfo";

explorer/src/lib/market-data/market-data.d.ts

@@ -2,3 +2,8 @@ type MarketData = {
   currentPrice: Record<string, number>;
   marketCap: Record<string, number>;
 };
+
+type MarketDataStorage = {
+  data: MarketData;
+  lastUpdate: Date;
+};

explorer/src/lib/services/index.js

@@ -1,2 +1 @@
 export { default as duskAPI } from "./duskAPI";
-export { default as marketDataStorage } from "./marketDataStorage";