@fileverse-dev/fortune-react 1.0.52 → 1.0.54

package/es/components/CryptoDenominationSelector/index.js

@@ -173,8 +173,7 @@ var CryptoDenominationSelector = function CryptoDenominationSelector(_a) {
               context: context,
               setContext: setContext,
               denomination: newDenomination,
-              decimals: decimals,
-              baseCurrency: "USD"
+              decimals: decimals
             })];
           case 1:
             _a.sent();

package/es/components/SheetTab/index.js

@@ -1,5 +1,6 @@
 import _ from "lodash";
 import React, { useCallback, useContext, useEffect, useRef, useState } from "react";
+import { useMediaQuery } from 'usehooks-ts';
 import { updateCell, addSheet } from "@fileverse-dev/fortune-core";
 import WorkbookContext from "../../context";
 import SVGIcon from "../SVGIcon";
@@ -7,6 +8,9 @@ import "./index.css";
 import SheetItem from "./SheetItem";
 import ZoomControl from "../ZoomControl";
 var SheetTab = function SheetTab() {
+  var isMobile = useMediaQuery('(max-width: 780px)', {
+    defaultValue: true
+  });
   var _a = useContext(WorkbookContext),
     context = _a.context,
     setContext = _a.setContext,
@@ -53,11 +57,29 @@ var SheetTab = function SheetTab() {
       setIsShowScrollBtn(tabCurrent.scrollWidth > tabCurrent.clientWidth);
     });
   }, [refs.cellInput, setContext, settings]);
+  var _d = useState(true),
+    showDisclaimer = _d[0],
+    setShowDisclaimer = _d[1];
+  var handleCloseDisclaimer = function handleCloseDisclaimer() {
+    var _a;
+    setShowDisclaimer(false);
+    var cornerPlus = document.getElementById("corner-plus");
+    if (cornerPlus) {
+      ((_a = cornerPlus === null || cornerPlus === void 0 ? void 0 : cornerPlus.style) === null || _a === void 0 ? void 0 : _a.display) === "block";
+    }
+  };
+  useEffect(function () {
+    var _a;
+    var cornerPlus = document.getElementById("corner-plus");
+    if (cornerPlus) {
+      ((_a = cornerPlus === null || cornerPlus === void 0 ? void 0 : cornerPlus.style) === null || _a === void 0 ? void 0 : _a.display) === "none";
+    }
+  }, [isMobile]);
   useEffect(function () {
     var _a;
     (_a = settings.onSheetCountChange) === null || _a === void 0 ? void 0 : _a.call(settings, context.luckysheetfile.length);
   }, [context.luckysheetfile.length]);
-  return /*#__PURE__*/React.createElement("div", null, /*#__PURE__*/React.createElement("div", {
+  return /*#__PURE__*/React.createElement("div", null, showDisclaimer && /*#__PURE__*/React.createElement("div", {
     className: "w-full",
     id: "denomination-warning",
     style: {
@@ -73,12 +95,18 @@ var SheetTab = function SheetTab() {
       bottom: "31px"
     }
   }, /*#__PURE__*/React.createElement("div", {
-    className: "max-w-7xl mx-auto px-4 py-1"
+    className: "max-w-7xl mx-auto px-4 py-1 ".concat(isMobile && "w-full flex justify-between")
   }, /*#__PURE__*/React.createElement("p", {
-    className: "text-center text-xsm"
+    className: "".concat(isMobile ? "text-left" : "text-center", " text-xsm")
   }, /*#__PURE__*/React.createElement("span", {
     className: "font-medium"
-  }, "Disclaimer:"), " Prices are not updated in real time and may differ slightly. Updates may be delayed by up to 20 minutes."))), /*#__PURE__*/React.createElement("div", {
+  }, "Disclaimer:"), " Prices are not updated in real time and may differ slightly. Updates may be delayed by up to 20 minutes."), isMobile && /*#__PURE__*/React.createElement("p", {
+    className: "ml-4 content-center cursor-pointer",
+    style: {
+      alignContent: "center"
+    },
+    onClick: handleCloseDisclaimer
+  }, "Close"))), /*#__PURE__*/React.createElement("div", {
     className: "luckysheet-sheet-area luckysheet-noselected-text",
     onContextMenu: function onContextMenu(e) {
       return e.preventDefault();

package/es/components/Toolbar/Combo.js

@@ -87,7 +87,11 @@ var Combo = function Combo(_a) {
   })))));
   return /*#__PURE__*/React.createElement("div", {
     ref: buttonRef,
-    className: "fortune-toolbar-item"
+    className: "fortune-toolbar-item",
+    onKeyDown: function onKeyDown(e) {
+      e.stopPropagation();
+      console.log("clicked");
+    }
   }, /*#__PURE__*/React.createElement(Popover, {
     open: open,
     onOpenChange: handleOpenChange,

package/es/components/Toolbar/index.js

@@ -1520,8 +1520,7 @@ var Toolbar = function Toolbar(_a) {
                           context: context,
                           setContext: setContext,
                           denomination: opt.value,
-                          decimals: decimals,
-                          baseCurrency: "USD"
+                          decimals: decimals
                         })];
                       case 1:
                         _a.sent();

package/es/utils/convertCellsToCrypto.d.ts

@@ -1,8 +1,8 @@
 export declare const getFiatSymbol: (code: string) => string;
-export declare function convertCellsToCrypto({ context, setContext, denomination, decimals, baseCurrency, }: {
+export declare const getFiatGeckoId: (symbol: string, baseCurrency: string) => string;
+export declare function convertCellsToCrypto({ context, setContext, denomination, decimals, }: {
     context: any;
     setContext: (fn: (ctx: any) => void) => void;
     denomination: string;
     decimals: number;
-    baseCurrency: string;
 }): Promise<void>;

package/es/utils/convertCellsToCrypto.js

@@ -114,7 +114,7 @@ var __generator = this && this.__generator || function (thisArg, body) {
   }
 };
 import { getFlowdata } from "@fileverse-dev/fortune-core";
-import { getCryptoPrice } from "./cryptoApi";
+import { getCachedPrice } from "./cryptoApi";
 export var getFiatSymbol = function getFiatSymbol(code) {
   switch (code) {
     case "USD":
@@ -133,6 +133,80 @@ export var getFiatSymbol = function getFiatSymbol(code) {
       return code;
   }
 };
+export var getFiatGeckoId = function getFiatGeckoId(symbol, baseCurrency) {
+  switch (symbol) {
+    case "$":
+      return "usd";
+    case "€":
+      return "eur";
+    case "￡":
+      return "gbp";
+    case "CN¥":
+      return "cny";
+    case "HK$":
+      return "hkd";
+    case "JP¥":
+      return "jpy";
+    case "AU$":
+      return "aud";
+    case "৳":
+      return "bdt";
+    case "BHD":
+      return "bhd";
+    case "R$":
+      return "brl";
+    case "CA$":
+      return "cad";
+    case "CHF":
+      return "chf";
+    case "CLP$":
+      return "clp";
+    case "kr.":
+      return "dkk";
+    case "GEL":
+      return "gel";
+    case "HUF":
+      return "huf";
+    case "Rp.":
+      return "idr";
+    case "Rs.":
+      return "inr";
+    case "₩":
+      return "krw";
+    case "KWD":
+      return "kwd";
+    case "K":
+      return "mmk";
+    case "Mex$":
+      return "mxn";
+    case "RM":
+      return "myr";
+    case "₦":
+      return "ngn";
+    case "kr":
+      return "nok";
+    case "₱":
+      return "php";
+    case "zł":
+      return "pln";
+    case "₽":
+      return "rub";
+    case "Rial":
+      return "sar";
+    case "S$":
+      return "sgd";
+    case "฿":
+      return "thb";
+    case "₺":
+      return "try";
+    case "грн.":
+      return "uah";
+    case "ZAR":
+      return "zar";
+    default:
+      return baseCurrency || "usd";
+  }
+};
 var COINGECKO_IDS = {
   BTC: "bitcoin",
   ETH: "ethereum",
@@ -142,87 +216,86 @@ export function convertCellsToCrypto(_a) {
   var context = _a.context,
     setContext = _a.setContext,
     denomination = _a.denomination,
-    decimals = _a.decimals,
-    baseCurrency = _a.baseCurrency;
+    decimals = _a.decimals;
   return __awaiter(this, void 0, void 0, function () {
-    var selections, flowdata, selectedCells, denomStr, coingeckoId, price, cellUpdates;
+    var selections, flowdata, selectedCells, denomStr, coingeckoId, cellUpdates;
     return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          selections = context.luckysheet_select_save;
-          flowdata = getFlowdata(context);
-          if (!selections || !flowdata) return [2];
-          selectedCells = [];
-          selections.forEach(function (selection) {
-            for (var row = selection.row[0]; row <= selection.row[1]; row += 1) {
-              for (var col = selection.column[0]; col <= selection.column[1]; col += 1) {
-                selectedCells.push({
-                  row: row,
-                  col: col
-                });
-              }
-            }
-          });
-          denomStr = typeof denomination === "string" && denomination.trim() !== "" ? denomination : "ETH";
-          denomStr = denomStr.toUpperCase();
-          coingeckoId = typeof COINGECKO_IDS[denomStr] === "string" ? COINGECKO_IDS[denomStr] : "ethereum";
-          return [4, getCryptoPrice(String(coingeckoId), baseCurrency.toLowerCase())];
-        case 1:
-          price = _b.sent();
-          cellUpdates = [];
-          selectedCells.forEach(function (_a) {
-            var _b, _c, _d;
-            var row = _a.row,
-              col = _a.col;
-            var cell = (_b = flowdata[row]) === null || _b === void 0 ? void 0 : _b[col];
-            var baseValue = 0;
-            if ((cell === null || cell === void 0 ? void 0 : cell.baseValue) !== undefined) {
-              baseValue = cell.baseValue;
-            } else {
-              if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "number") {
-                baseValue = cell.v;
-              } else if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "string") {
-                baseValue = parseFloat(cell.v);
-              }
-              if (((_c = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _c === void 0 ? void 0 : _c.fa) && cell.ct.fa.includes('"')) {
-                var numericValue = parseFloat(((_d = cell.v) === null || _d === void 0 ? void 0 : _d.toString()) || "0");
-                if (!Number.isNaN(numericValue)) {
-                  baseValue = numericValue;
-                }
-              }
-            }
-            if (!baseValue || Number.isNaN(baseValue)) return;
-            var cryptoValue = baseValue / price;
-            cellUpdates.push({
+      selections = context.luckysheet_select_save;
+      flowdata = getFlowdata(context);
+      if (!selections || !flowdata) return [2];
+      selectedCells = [];
+      selections.forEach(function (selection) {
+        for (var row = selection.row[0]; row <= selection.row[1]; row += 1) {
+          for (var col = selection.column[0]; col <= selection.column[1]; col += 1) {
+            selectedCells.push({
               row: row,
-              col: col,
-              baseValue: baseValue,
-              cryptoValue: cryptoValue
+              col: col
             });
-          });
-          setContext(function (ctx) {
-            var d = getFlowdata(ctx);
-            if (!d || !Array.isArray(d)) return;
-            cellUpdates.forEach(function (_a) {
-              var row = _a.row,
-                col = _a.col,
-                baseValue = _a.baseValue,
-                cryptoValue = _a.cryptoValue;
-              if (!d[row]) d[row] = [];
-              if (!d[row][col]) d[row][col] = {};
-              var cellCp = d[row][col];
-              cellCp.v = baseValue.toString();
-              cellCp.m = "".concat(cryptoValue.toFixed(decimals), " ").concat(denomStr);
-              cellCp.ct = {
-                fa: "0.".concat("0".repeat(decimals), " \"").concat(denomStr, "\""),
-                t: "n"
-              };
-              cellCp.baseValue = baseValue;
-              d[row][col] = cellCp;
-            });
-          });
-          return [2];
-      }
+          }
+        }
+      });
+      denomStr = typeof denomination === "string" && denomination.trim() !== "" ? denomination : "ETH";
+      denomStr = denomStr.toUpperCase();
+      coingeckoId = typeof COINGECKO_IDS[denomStr] === "string" ? COINGECKO_IDS[denomStr] : "ethereum";
+      cellUpdates = [];
+      selectedCells.forEach(function (_a) {
+        var _b, _c, _d, _e;
+        var row = _a.row,
+          col = _a.col;
+        var cell = (_b = flowdata[row]) === null || _b === void 0 ? void 0 : _b[col];
+        var baseValue = 0;
+        if ((cell === null || cell === void 0 ? void 0 : cell.baseValue) !== undefined) {
+          baseValue = cell.baseValue;
+        } else {
+          if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "number") {
+            baseValue = cell.v;
+          } else if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "string") {
+            baseValue = parseFloat(cell.v);
+          }
+          if (((_c = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _c === void 0 ? void 0 : _c.fa) && cell.ct.fa.includes('"')) {
+            var numericValue = parseFloat(((_d = cell.v) === null || _d === void 0 ? void 0 : _d.toString()) || "0");
+            if (!Number.isNaN(numericValue)) {
+              baseValue = numericValue;
+            }
+          }
+        }
+        if (!baseValue || Number.isNaN(baseValue)) return;
+        var fiatSymbol = (_e = cell === null || cell === void 0 ? void 0 : cell.m) === null || _e === void 0 ? void 0 : _e.split(" ")[0];
+        var fiatVsCryptoPrice = getCachedPrice(coingeckoId, getFiatGeckoId(fiatSymbol, cell === null || cell === void 0 ? void 0 : cell.baseCurrency));
+        var cryptoValue = baseValue / fiatVsCryptoPrice;
+        console.log(getFiatGeckoId(fiatSymbol, cell === null || cell === void 0 ? void 0 : cell.baseCurrency));
+        cellUpdates.push({
+          row: row,
+          col: col,
+          baseValue: baseValue,
+          cryptoValue: cryptoValue,
+          baseCurrency: getFiatGeckoId(fiatSymbol) || "usd"
+        });
+      });
+      setContext(function (ctx) {
+        var d = getFlowdata(ctx);
+        if (!d || !Array.isArray(d)) return;
+        cellUpdates.forEach(function (_a) {
+          var row = _a.row,
+            col = _a.col,
+            baseValue = _a.baseValue,
+            cryptoValue = _a.cryptoValue,
+            baseCurrency = _a.baseCurrency;
+          if (!d[row]) d[row] = [];
+          if (!d[row][col]) d[row][col] = {};
+          var cellCp = d[row][col];
+          cellCp.v = baseValue.toString();
+          cellCp.m = "".concat(cryptoValue.toFixed(decimals), " ").concat(denomStr);
+          cellCp.ct = {
+            fa: "0.".concat("0".repeat(decimals), " \"").concat(denomStr, "\""),
+            t: "n"
+          };
+          cellCp.baseValue = baseValue;
+          cellCp.baseCurrency = baseCurrency.toLowerCase();
+          d[row][col] = cellCp;
+        });
+      });
+      return [2];
     });
   });
 }

package/es/utils/cryptoApi.d.ts

@@ -1,2 +1,3 @@
 export declare function getCryptoPrice(crypto: string, fiat: string): Promise<number>;
+export declare const getCachedPrice: (crypto: string, fiat: string) => number;
 export declare function clearCryptoPriceCache(): void;

package/es/utils/cryptoApi.js

@@ -113,10 +113,10 @@ var __generator = this && this.__generator || function (thisArg, body) {
     };
   }
 };
-var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,ethereum,solana&vs_currencies=usd,eur,gbp,jpy,cny,inr,cad,aud,nzd,sek,pln";
+var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,ethereum,solana&vs_currencies=usd,aed,ars,aud,bdt,bhd,bmd,brl,cad,chf,clp,cny,czk,dkk,eur,gbp,gel,hkd,huf,idr,ils,inr,jpy,krw,kwd,lkr,mmk,mxn,myr,ngn,nok,nzd,php,pkr,pln,rub,sar,sek,sgd,thb,try,twd,uah,vef,vnd,zar";
 var CACHE_DURATION = 60 * 1000;
 var CRYPTO_LIST = ["bitcoin", "ethereum", "solana"];
-var FIAT_LIST = ["usd", "eur", "gbp", "jpy", "cny", "inr", "cad", "aud", "nzd", "sek", "pln"];
+var FIAT_LIST = ["usd", "aed", "ars", "aud", "bdt", "bhd", "bmd", "brl", "cad", "chf", "clp", "cny", "czk", "dkk", "eur", "gbp", "gel", "hkd", "huf", "idr", "ils", "inr", "jpy", "krw", "kwd", "lkr", "mmk", "mxn", "myr", "ngn", "nok", "nzd", "php", "pkr", "pln", "rub", "sar", "sek", "sgd", "thb", "try", "twd", "uah", "vef", "vnd", "zar"];
 var priceCache = {};
 function updatePriceCache(data, timestamp) {
   CRYPTO_LIST.forEach(function (crypto) {
@@ -155,6 +155,7 @@ export function getCryptoPrice(crypto, fiat) {
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
+          console.log("Fetching price for", crypto, fiat);
           key = "".concat(crypto, "-").concat(fiat).toLowerCase();
           now = Date.now();
           if (priceCache[key] && now - priceCache[key].timestamp < CACHE_DURATION) {
@@ -177,6 +178,12 @@ export function getCryptoPrice(crypto, fiat) {
     });
   });
 }
+export var getCachedPrice = function getCachedPrice(crypto, fiat) {
+  var _a;
+  var key = "".concat(crypto, "-").concat(fiat).toLowerCase();
+  getCryptoPrice(crypto, fiat);
+  return (_a = priceCache[key]) === null || _a === void 0 ? void 0 : _a.price;
+};
 export function clearCryptoPriceCache() {
   Object.keys(priceCache).forEach(function (key) {
     return delete priceCache[key];

package/lib/components/CryptoDenominationSelector/index.js

@@ -182,8 +182,7 @@ var CryptoDenominationSelector = function CryptoDenominationSelector(_a) {
               context: context,
               setContext: setContext,
               denomination: newDenomination,
-              decimals: decimals,
-              baseCurrency: "USD"
+              decimals: decimals
             })];
           case 1:
             _a.sent();

package/lib/components/SheetTab/index.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _lodash = _interopRequireDefault(require("lodash"));
 var _react = _interopRequireWildcard(require("react"));
+var _usehooksTs = require("usehooks-ts");
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _context = _interopRequireDefault(require("../../context"));
 var _SVGIcon = _interopRequireDefault(require("../SVGIcon"));
@@ -16,6 +17,9 @@ var _ZoomControl = _interopRequireDefault(require("../ZoomControl"));
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != _typeof(e) && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (var _t in e) "default" !== _t && {}.hasOwnProperty.call(e, _t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, _t)) && (i.get || i.set) ? o(f, _t, i) : f[_t] = e[_t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 var SheetTab = function SheetTab() {
+  var isMobile = (0, _usehooksTs.useMediaQuery)('(max-width: 780px)', {
+    defaultValue: true
+  });
   var _a = (0, _react.useContext)(_context.default),
     context = _a.context,
     setContext = _a.setContext,
@@ -62,11 +66,29 @@ var SheetTab = function SheetTab() {
       setIsShowScrollBtn(tabCurrent.scrollWidth > tabCurrent.clientWidth);
     });
   }, [refs.cellInput, setContext, settings]);
+  var _d = (0, _react.useState)(true),
+    showDisclaimer = _d[0],
+    setShowDisclaimer = _d[1];
+  var handleCloseDisclaimer = function handleCloseDisclaimer() {
+    var _a;
+    setShowDisclaimer(false);
+    var cornerPlus = document.getElementById("corner-plus");
+    if (cornerPlus) {
+      ((_a = cornerPlus === null || cornerPlus === void 0 ? void 0 : cornerPlus.style) === null || _a === void 0 ? void 0 : _a.display) === "block";
+    }
+  };
+  (0, _react.useEffect)(function () {
+    var _a;
+    var cornerPlus = document.getElementById("corner-plus");
+    if (cornerPlus) {
+      ((_a = cornerPlus === null || cornerPlus === void 0 ? void 0 : cornerPlus.style) === null || _a === void 0 ? void 0 : _a.display) === "none";
+    }
+  }, [isMobile]);
   (0, _react.useEffect)(function () {
     var _a;
     (_a = settings.onSheetCountChange) === null || _a === void 0 ? void 0 : _a.call(settings, context.luckysheetfile.length);
   }, [context.luckysheetfile.length]);
-  return /*#__PURE__*/_react.default.createElement("div", null, /*#__PURE__*/_react.default.createElement("div", {
+  return /*#__PURE__*/_react.default.createElement("div", null, showDisclaimer && /*#__PURE__*/_react.default.createElement("div", {
     className: "w-full",
     id: "denomination-warning",
     style: {
@@ -82,12 +104,18 @@ var SheetTab = function SheetTab() {
       bottom: "31px"
     }
   }, /*#__PURE__*/_react.default.createElement("div", {
-    className: "max-w-7xl mx-auto px-4 py-1"
+    className: "max-w-7xl mx-auto px-4 py-1 ".concat(isMobile && "w-full flex justify-between")
   }, /*#__PURE__*/_react.default.createElement("p", {
-    className: "text-center text-xsm"
+    className: "".concat(isMobile ? "text-left" : "text-center", " text-xsm")
   }, /*#__PURE__*/_react.default.createElement("span", {
     className: "font-medium"
-  }, "Disclaimer:"), " Prices are not updated in real time and may differ slightly. Updates may be delayed by up to 20 minutes."))), /*#__PURE__*/_react.default.createElement("div", {
+  }, "Disclaimer:"), " Prices are not updated in real time and may differ slightly. Updates may be delayed by up to 20 minutes."), isMobile && /*#__PURE__*/_react.default.createElement("p", {
+    className: "ml-4 content-center cursor-pointer",
+    style: {
+      alignContent: "center"
+    },
+    onClick: handleCloseDisclaimer
+  }, "Close"))), /*#__PURE__*/_react.default.createElement("div", {
     className: "luckysheet-sheet-area luckysheet-noselected-text",
     onContextMenu: function onContextMenu(e) {
       return e.preventDefault();

package/lib/components/Toolbar/Combo.js

@@ -96,7 +96,11 @@ var Combo = function Combo(_a) {
   })))));
   return /*#__PURE__*/_react.default.createElement("div", {
     ref: buttonRef,
-    className: "fortune-toolbar-item"
+    className: "fortune-toolbar-item",
+    onKeyDown: function onKeyDown(e) {
+      e.stopPropagation();
+      console.log("clicked");
+    }
   }, /*#__PURE__*/_react.default.createElement(_ui.Popover, {
     open: open,
     onOpenChange: handleOpenChange,

package/lib/components/Toolbar/index.js

@@ -1529,8 +1529,7 @@ var Toolbar = function Toolbar(_a) {
                           context: context,
                           setContext: setContext,
                           denomination: opt.value,
-                          decimals: decimals,
-                          baseCurrency: "USD"
+                          decimals: decimals
                         })];
                       case 1:
                         _a.sent();

package/lib/utils/convertCellsToCrypto.d.ts

@@ -1,8 +1,8 @@
 export declare const getFiatSymbol: (code: string) => string;
-export declare function convertCellsToCrypto({ context, setContext, denomination, decimals, baseCurrency, }: {
+export declare const getFiatGeckoId: (symbol: string, baseCurrency: string) => string;
+export declare function convertCellsToCrypto({ context, setContext, denomination, decimals, }: {
     context: any;
     setContext: (fn: (ctx: any) => void) => void;
     denomination: string;
     decimals: number;
-    baseCurrency: string;
 }): Promise<void>;

package/lib/utils/convertCellsToCrypto.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.convertCellsToCrypto = convertCellsToCrypto;
-exports.getFiatSymbol = void 0;
+exports.getFiatSymbol = exports.getFiatGeckoId = void 0;
 var _fortuneCore = require("@fileverse-dev/fortune-core");
 var _cryptoApi = require("./cryptoApi");
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
@@ -140,6 +140,80 @@ var getFiatSymbol = exports.getFiatSymbol = function getFiatSymbol(code) {
       return code;
   }
 };
+var getFiatGeckoId = exports.getFiatGeckoId = function getFiatGeckoId(symbol, baseCurrency) {
+  switch (symbol) {
+    case "$":
+      return "usd";
+    case "€":
+      return "eur";
+    case "￡":
+      return "gbp";
+    case "CN¥":
+      return "cny";
+    case "HK$":
+      return "hkd";
+    case "JP¥":
+      return "jpy";
+    case "AU$":
+      return "aud";
+    case "৳":
+      return "bdt";
+    case "BHD":
+      return "bhd";
+    case "R$":
+      return "brl";
+    case "CA$":
+      return "cad";
+    case "CHF":
+      return "chf";
+    case "CLP$":
+      return "clp";
+    case "kr.":
+      return "dkk";
+    case "GEL":
+      return "gel";
+    case "HUF":
+      return "huf";
+    case "Rp.":
+      return "idr";
+    case "Rs.":
+      return "inr";
+    case "₩":
+      return "krw";
+    case "KWD":
+      return "kwd";
+    case "K":
+      return "mmk";
+    case "Mex$":
+      return "mxn";
+    case "RM":
+      return "myr";
+    case "₦":
+      return "ngn";
+    case "kr":
+      return "nok";
+    case "₱":
+      return "php";
+    case "zł":
+      return "pln";
+    case "₽":
+      return "rub";
+    case "Rial":
+      return "sar";
+    case "S$":
+      return "sgd";
+    case "฿":
+      return "thb";
+    case "₺":
+      return "try";
+    case "грн.":
+      return "uah";
+    case "ZAR":
+      return "zar";
+    default:
+      return baseCurrency || "usd";
+  }
+};
 var COINGECKO_IDS = {
   BTC: "bitcoin",
   ETH: "ethereum",
@@ -149,87 +223,86 @@ function convertCellsToCrypto(_a) {
   var context = _a.context,
     setContext = _a.setContext,
     denomination = _a.denomination,
-    decimals = _a.decimals,
-    baseCurrency = _a.baseCurrency;
+    decimals = _a.decimals;
   return __awaiter(this, void 0, void 0, function () {
-    var selections, flowdata, selectedCells, denomStr, coingeckoId, price, cellUpdates;
+    var selections, flowdata, selectedCells, denomStr, coingeckoId, cellUpdates;
     return __generator(this, function (_b) {
-      switch (_b.label) {
-        case 0:
-          selections = context.luckysheet_select_save;
-          flowdata = (0, _fortuneCore.getFlowdata)(context);
-          if (!selections || !flowdata) return [2];
-          selectedCells = [];
-          selections.forEach(function (selection) {
-            for (var row = selection.row[0]; row <= selection.row[1]; row += 1) {
-              for (var col = selection.column[0]; col <= selection.column[1]; col += 1) {
-                selectedCells.push({
-                  row: row,
-                  col: col
-                });
-              }
-            }
-          });
-          denomStr = typeof denomination === "string" && denomination.trim() !== "" ? denomination : "ETH";
-          denomStr = denomStr.toUpperCase();
-          coingeckoId = typeof COINGECKO_IDS[denomStr] === "string" ? COINGECKO_IDS[denomStr] : "ethereum";
-          return [4, (0, _cryptoApi.getCryptoPrice)(String(coingeckoId), baseCurrency.toLowerCase())];
-        case 1:
-          price = _b.sent();
-          cellUpdates = [];
-          selectedCells.forEach(function (_a) {
-            var _b, _c, _d;
-            var row = _a.row,
-              col = _a.col;
-            var cell = (_b = flowdata[row]) === null || _b === void 0 ? void 0 : _b[col];
-            var baseValue = 0;
-            if ((cell === null || cell === void 0 ? void 0 : cell.baseValue) !== undefined) {
-              baseValue = cell.baseValue;
-            } else {
-              if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "number") {
-                baseValue = cell.v;
-              } else if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "string") {
-                baseValue = parseFloat(cell.v);
-              }
-              if (((_c = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _c === void 0 ? void 0 : _c.fa) && cell.ct.fa.includes('"')) {
-                var numericValue = parseFloat(((_d = cell.v) === null || _d === void 0 ? void 0 : _d.toString()) || "0");
-                if (!Number.isNaN(numericValue)) {
-                  baseValue = numericValue;
-                }
-              }
-            }
-            if (!baseValue || Number.isNaN(baseValue)) return;
-            var cryptoValue = baseValue / price;
-            cellUpdates.push({
+      selections = context.luckysheet_select_save;
+      flowdata = (0, _fortuneCore.getFlowdata)(context);
+      if (!selections || !flowdata) return [2];
+      selectedCells = [];
+      selections.forEach(function (selection) {
+        for (var row = selection.row[0]; row <= selection.row[1]; row += 1) {
+          for (var col = selection.column[0]; col <= selection.column[1]; col += 1) {
+            selectedCells.push({
               row: row,
-              col: col,
-              baseValue: baseValue,
-              cryptoValue: cryptoValue
+              col: col
             });
-          });
-          setContext(function (ctx) {
-            var d = (0, _fortuneCore.getFlowdata)(ctx);
-            if (!d || !Array.isArray(d)) return;
-            cellUpdates.forEach(function (_a) {
-              var row = _a.row,
-                col = _a.col,
-                baseValue = _a.baseValue,
-                cryptoValue = _a.cryptoValue;
-              if (!d[row]) d[row] = [];
-              if (!d[row][col]) d[row][col] = {};
-              var cellCp = d[row][col];
-              cellCp.v = baseValue.toString();
-              cellCp.m = "".concat(cryptoValue.toFixed(decimals), " ").concat(denomStr);
-              cellCp.ct = {
-                fa: "0.".concat("0".repeat(decimals), " \"").concat(denomStr, "\""),
-                t: "n"
-              };
-              cellCp.baseValue = baseValue;
-              d[row][col] = cellCp;
-            });
-          });
-          return [2];
-      }
+          }
+        }
+      });
+      denomStr = typeof denomination === "string" && denomination.trim() !== "" ? denomination : "ETH";
+      denomStr = denomStr.toUpperCase();
+      coingeckoId = typeof COINGECKO_IDS[denomStr] === "string" ? COINGECKO_IDS[denomStr] : "ethereum";
+      cellUpdates = [];
+      selectedCells.forEach(function (_a) {
+        var _b, _c, _d, _e;
+        var row = _a.row,
+          col = _a.col;
+        var cell = (_b = flowdata[row]) === null || _b === void 0 ? void 0 : _b[col];
+        var baseValue = 0;
+        if ((cell === null || cell === void 0 ? void 0 : cell.baseValue) !== undefined) {
+          baseValue = cell.baseValue;
+        } else {
+          if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "number") {
+            baseValue = cell.v;
+          } else if (typeof (cell === null || cell === void 0 ? void 0 : cell.v) === "string") {
+            baseValue = parseFloat(cell.v);
+          }
+          if (((_c = cell === null || cell === void 0 ? void 0 : cell.ct) === null || _c === void 0 ? void 0 : _c.fa) && cell.ct.fa.includes('"')) {
+            var numericValue = parseFloat(((_d = cell.v) === null || _d === void 0 ? void 0 : _d.toString()) || "0");
+            if (!Number.isNaN(numericValue)) {
+              baseValue = numericValue;
+            }
+          }
+        }
+        if (!baseValue || Number.isNaN(baseValue)) return;
+        var fiatSymbol = (_e = cell === null || cell === void 0 ? void 0 : cell.m) === null || _e === void 0 ? void 0 : _e.split(" ")[0];
+        var fiatVsCryptoPrice = (0, _cryptoApi.getCachedPrice)(coingeckoId, getFiatGeckoId(fiatSymbol, cell === null || cell === void 0 ? void 0 : cell.baseCurrency));
+        var cryptoValue = baseValue / fiatVsCryptoPrice;
+        console.log(getFiatGeckoId(fiatSymbol, cell === null || cell === void 0 ? void 0 : cell.baseCurrency));
+        cellUpdates.push({
+          row: row,
+          col: col,
+          baseValue: baseValue,
+          cryptoValue: cryptoValue,
+          baseCurrency: getFiatGeckoId(fiatSymbol) || "usd"
+        });
+      });
+      setContext(function (ctx) {
+        var d = (0, _fortuneCore.getFlowdata)(ctx);
+        if (!d || !Array.isArray(d)) return;
+        cellUpdates.forEach(function (_a) {
+          var row = _a.row,
+            col = _a.col,
+            baseValue = _a.baseValue,
+            cryptoValue = _a.cryptoValue,
+            baseCurrency = _a.baseCurrency;
+          if (!d[row]) d[row] = [];
+          if (!d[row][col]) d[row][col] = {};
+          var cellCp = d[row][col];
+          cellCp.v = baseValue.toString();
+          cellCp.m = "".concat(cryptoValue.toFixed(decimals), " ").concat(denomStr);
+          cellCp.ct = {
+            fa: "0.".concat("0".repeat(decimals), " \"").concat(denomStr, "\""),
+            t: "n"
+          };
+          cellCp.baseValue = baseValue;
+          cellCp.baseCurrency = baseCurrency.toLowerCase();
+          d[row][col] = cellCp;
+        });
+      });
+      return [2];
     });
   });
 }

package/lib/utils/cryptoApi.d.ts

@@ -1,2 +1,3 @@
 export declare function getCryptoPrice(crypto: string, fiat: string): Promise<number>;
+export declare const getCachedPrice: (crypto: string, fiat: string) => number;
 export declare function clearCryptoPriceCache(): void;

package/lib/utils/cryptoApi.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.clearCryptoPriceCache = clearCryptoPriceCache;
+exports.getCachedPrice = void 0;
 exports.getCryptoPrice = getCryptoPrice;
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
@@ -120,10 +121,10 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
     };
   }
 };
-var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,ethereum,solana&vs_currencies=usd,eur,gbp,jpy,cny,inr,cad,aud,nzd,sek,pln";
+var COINGECKO_API = "https://api.coingecko.com/api/v3/simple/price?ids=bitcoin,ethereum,solana&vs_currencies=usd,aed,ars,aud,bdt,bhd,bmd,brl,cad,chf,clp,cny,czk,dkk,eur,gbp,gel,hkd,huf,idr,ils,inr,jpy,krw,kwd,lkr,mmk,mxn,myr,ngn,nok,nzd,php,pkr,pln,rub,sar,sek,sgd,thb,try,twd,uah,vef,vnd,zar";
 var CACHE_DURATION = 60 * 1000;
 var CRYPTO_LIST = ["bitcoin", "ethereum", "solana"];
-var FIAT_LIST = ["usd", "eur", "gbp", "jpy", "cny", "inr", "cad", "aud", "nzd", "sek", "pln"];
+var FIAT_LIST = ["usd", "aed", "ars", "aud", "bdt", "bhd", "bmd", "brl", "cad", "chf", "clp", "cny", "czk", "dkk", "eur", "gbp", "gel", "hkd", "huf", "idr", "ils", "inr", "jpy", "krw", "kwd", "lkr", "mmk", "mxn", "myr", "ngn", "nok", "nzd", "php", "pkr", "pln", "rub", "sar", "sek", "sgd", "thb", "try", "twd", "uah", "vef", "vnd", "zar"];
 var priceCache = {};
 function updatePriceCache(data, timestamp) {
   CRYPTO_LIST.forEach(function (crypto) {
@@ -162,6 +163,7 @@ function getCryptoPrice(crypto, fiat) {
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
+          console.log("Fetching price for", crypto, fiat);
           key = "".concat(crypto, "-").concat(fiat).toLowerCase();
           now = Date.now();
           if (priceCache[key] && now - priceCache[key].timestamp < CACHE_DURATION) {
@@ -184,6 +186,12 @@ function getCryptoPrice(crypto, fiat) {
     });
   });
 }
+var getCachedPrice = exports.getCachedPrice = function getCachedPrice(crypto, fiat) {
+  var _a;
+  var key = "".concat(crypto, "-").concat(fiat).toLowerCase();
+  getCryptoPrice(crypto, fiat);
+  return (_a = priceCache[key]) === null || _a === void 0 ? void 0 : _a.price;
+};
 function clearCryptoPriceCache() {
   Object.keys(priceCache).forEach(function (key) {
     return delete priceCache[key];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fileverse-dev/fortune-react",
-  "version": "1.0.52",
+  "version": "1.0.54",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "module": "es/index.js",
@@ -16,7 +16,7 @@
     "tsc": "tsc"
   },
   "dependencies": {
-    "@fileverse-dev/fortune-core": "1.0.52",
+    "@fileverse-dev/fortune-core": "1.0.54",
     "@fileverse/ui": "^4.1.7-patch-16",
     "@tippyjs/react": "^4.2.6",
     "@types/regenerator-runtime": "^0.13.6",