@ecency/wallets 1.5.7 → 1.5.9

package/dist/browser/index.d.ts

@@ -1781,7 +1781,7 @@ declare function getAllTokensListQueryOptions(username?: string): _tanstack_reac
     };
 };
 
-declare function getAccountWalletListQueryOptions(username: string): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<string[], Error, string[], string[]>, "queryFn"> & {
+declare function getAccountWalletListQueryOptions(username: string, currency?: string): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<string[], Error, string[], string[]>, "queryFn"> & {
     queryFn?: _tanstack_react_query.QueryFunction<string[], string[], never> | undefined;
 } & {
     queryKey: string[] & {
@@ -1792,6 +1792,7 @@ declare function getAccountWalletListQueryOptions(username: string): _tanstack_r
 
 interface Options {
     refetch: boolean;
+    currency?: string;
 }
 declare function getAccountWalletAssetInfoQueryOptions(username: string, asset: string, options?: Options): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<GeneralAssetInfo | undefined, Error, GeneralAssetInfo | undefined, string[]>, "queryFn"> & {
     queryFn?: _tanstack_react_query.QueryFunction<GeneralAssetInfo | undefined, string[], never> | undefined;
@@ -1802,7 +1803,7 @@ declare function getAccountWalletAssetInfoQueryOptions(username: string, asset:
     };
 };
 
-declare function getTokenOperationsQueryOptions(token: string, username: string, isForOwner?: boolean): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<AssetOperation[], Error, AssetOperation[], (string | boolean)[]>, "queryFn"> & {
+declare function getTokenOperationsQueryOptions(token: string, username: string, isForOwner?: boolean, currency?: string): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<AssetOperation[], Error, AssetOperation[], (string | boolean)[]>, "queryFn"> & {
     queryFn?: _tanstack_react_query.QueryFunction<AssetOperation[], (string | boolean)[], never> | undefined;
 } & {
     queryKey: (string | boolean)[] & {
@@ -1823,7 +1824,7 @@ interface VisionPortfolioResponse {
     currency?: string;
     wallets: VisionPortfolioWalletItem[];
 }
-declare function getVisionPortfolioQueryOptions(username: string): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<VisionPortfolioResponse, Error, VisionPortfolioResponse, string[]>, "queryFn"> & {
+declare function getVisionPortfolioQueryOptions(username: string, currency?: string): _tanstack_react_query.OmitKeyof<_tanstack_react_query.UseQueryOptions<VisionPortfolioResponse, Error, VisionPortfolioResponse, string[]>, "queryFn"> & {
     queryFn?: _tanstack_react_query.QueryFunction<VisionPortfolioResponse, string[], never> | undefined;
 } & {
     queryKey: string[] & {

package/dist/browser/index.js

@@ -1,4 +1,4 @@
-import { CONFIG, getAccountFullQueryOptions, getQueryClient, getDynamicPropsQueryOptions, useBroadcastMutation, getSpkMarkets, getSpkWallet, getHiveEngineTokensMarket, getHiveEngineTokensBalances, getHiveEngineTokensMetadata, getHiveEngineTokenTransactions, getHiveEngineTokenMetrics, getHiveEngineUnclaimedRewards, EcencyAnalytics, useAccountUpdate } from '@ecency/sdk';
+import { CONFIG, getAccountFullQueryOptions, getQueryClient, getDynamicPropsQueryOptions, useBroadcastMutation, getSpkMarkets, getSpkWallet, getHiveEngineTokensMarket, getHiveEngineTokensBalances, getHiveEngineTokensMetadata, getHiveEngineTokenTransactions, getHiveEngineTokenMetrics, getHiveEngineUnclaimedRewards, EcencyAnalytics, useAccountUpdate, getCurrencyRate } from '@ecency/sdk';
 export { getHiveEngineMetrics, getHiveEngineOpenOrders, getHiveEngineOrderBook, getHiveEngineTradeHistory } from '@ecency/sdk';
 import { useQuery, queryOptions, infiniteQueryOptions, useQueryClient, useMutation } from '@tanstack/react-query';
 import bip39, { mnemonicToSeedSync } from 'bip39';
@@ -1477,7 +1477,7 @@ function useClaimRewards(username, auth, onSuccess) {
         queryKey: getAccountFullQueryOptions(username).queryKey
       });
       queryClient.invalidateQueries({
-        queryKey: getVisionPortfolioQueryOptions(username).queryKey
+        queryKey: ["ecency-wallets", "portfolio", "v2", username]
       });
       queryClient.invalidateQueries({
         queryKey: getHiveAssetGeneralInfoQueryOptions(username).queryKey
@@ -1498,7 +1498,7 @@ function useClaimRewards(username, auth, onSuccess) {
           queryKey: getAccountFullQueryOptions(username).queryKey
         });
         queryClient.invalidateQueries({
-          queryKey: getVisionPortfolioQueryOptions(username).queryKey
+          queryKey: ["ecency-wallets", "portfolio", "v2", username]
         });
         queryClient.invalidateQueries({
           queryKey: getHiveAssetGeneralInfoQueryOptions(username).queryKey
@@ -3125,9 +3125,7 @@ function parseToken(rawToken) {
   }
   const normalizedSymbol = symbol.toUpperCase();
   const title = normalizeString(token.title) ?? normalizeString(token.display) ?? normalizeString(token.label) ?? normalizeString(token.friendlyName) ?? normalizeString(token.name) ?? normalizedSymbol;
-  const price = normalizeNumber(token.fiatRate) ?? normalizeNumber(token.price) ?? normalizeNumber(token.priceUsd) ?? normalizeNumber(token.usdPrice) ?? normalizeNumber(token.metrics?.price) ?? normalizeNumber(
-    token.metrics?.priceUsd
-  ) ?? 0;
+  const price = normalizeNumber(token.fiatRate) ?? 0;
   const apr = normalizeApr(token.apr) ?? normalizeApr(token.aprPercent) ?? normalizeApr(token.metrics?.apr) ?? normalizeApr(
     token.metrics?.aprPercent
   );
@@ -3204,14 +3202,15 @@ function resolveUsername(payload) {
   const record = payload;
   return normalizeString(record.username) ?? normalizeString(record.name) ?? normalizeString(record.account);
 }
-function getVisionPortfolioQueryOptions(username) {
+function getVisionPortfolioQueryOptions(username, currency = "usd") {
   return queryOptions({
     queryKey: [
       "ecency-wallets",
       "portfolio",
       "v2",
       username,
-      "only-enabled"
+      "only-enabled",
+      currency
     ],
     enabled: Boolean(username),
     staleTime: 6e4,
@@ -3232,7 +3231,7 @@ function getVisionPortfolioQueryOptions(username) {
           Accept: "application/json",
           "Content-Type": "application/json"
         },
-        body: JSON.stringify({ username, onlyEnabled: true })
+        body: JSON.stringify({ username, onlyEnabled: true, currency })
       });
       if (!response.ok) {
         throw new Error(
@@ -3249,7 +3248,7 @@ function getVisionPortfolioQueryOptions(username) {
       return {
         username: resolveUsername(payload) ?? username,
         currency: normalizeString(
-          payload?.currency
+          payload?.fiatCurrency ?? payload?.currency
         )?.toUpperCase(),
         wallets: tokens
       };
@@ -3275,12 +3274,12 @@ var BASIC_TOKENS = [
   "HP" /* HivePower */,
   "HBD" /* HiveDollar */
 ];
-function getAccountWalletListQueryOptions(username) {
+function getAccountWalletListQueryOptions(username, currency = "usd") {
   return queryOptions({
-    queryKey: ["ecency-wallets", "list", username],
+    queryKey: ["ecency-wallets", "list", username, currency],
     enabled: !!username,
     queryFn: async () => {
-      const portfolioQuery = getVisionPortfolioQueryOptions(username);
+      const portfolioQuery = getVisionPortfolioQueryOptions(username, currency);
       const queryClient = getQueryClient();
       const accountQuery = getAccountFullQueryOptions(username);
       let account;
@@ -3758,6 +3757,7 @@ function getTronAssetGeneralInfoQueryOptions(username) {
 // src/modules/wallets/queries/get-account-wallet-asset-info-query-options.ts
 function getAccountWalletAssetInfoQueryOptions(username, asset, options2 = { refetch: false }) {
   const queryClient = getQueryClient();
+  const currency = options2.currency ?? "usd";
   const fetchQuery = async (queryOptions43) => {
     if (options2.refetch) {
       await queryClient.fetchQuery(queryOptions43);
@@ -3766,7 +3766,22 @@ function getAccountWalletAssetInfoQueryOptions(username, asset, options2 = { ref
     }
     return queryClient.getQueryData(queryOptions43.queryKey);
   };
-  const portfolioQuery = getVisionPortfolioQueryOptions(username);
+  const convertPriceToUserCurrency = async (assetInfo) => {
+    if (!assetInfo || currency === "usd") {
+      return assetInfo;
+    }
+    try {
+      const conversionRate = await getCurrencyRate(currency);
+      return {
+        ...assetInfo,
+        price: assetInfo.price * conversionRate
+      };
+    } catch (error) {
+      console.warn(`Failed to convert price from USD to ${currency}:`, error);
+      return assetInfo;
+    }
+  };
+  const portfolioQuery = getVisionPortfolioQueryOptions(username, currency);
   const getPortfolioAssetInfo = async () => {
     try {
       const portfolio = await queryClient.fetchQuery(portfolioQuery);
@@ -3779,53 +3794,56 @@ function getAccountWalletAssetInfoQueryOptions(username, asset, options2 = { ref
     }
   };
   return queryOptions({
-    queryKey: ["ecency-wallets", "asset-info", username, asset],
+    queryKey: ["ecency-wallets", "asset-info", username, asset, currency],
     queryFn: async () => {
       const portfolioAssetInfo = await getPortfolioAssetInfo();
-      if (portfolioAssetInfo) {
+      if (portfolioAssetInfo && portfolioAssetInfo.price > 0) {
         return portfolioAssetInfo;
       }
+      let assetInfo;
       if (asset === "HIVE") {
-        return fetchQuery(getHiveAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getHiveAssetGeneralInfoQueryOptions(username));
       } else if (asset === "HP") {
-        return fetchQuery(getHivePowerAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getHivePowerAssetGeneralInfoQueryOptions(username));
       } else if (asset === "HBD") {
-        return fetchQuery(getHbdAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getHbdAssetGeneralInfoQueryOptions(username));
       } else if (asset === "SPK") {
-        return fetchQuery(getSpkAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getSpkAssetGeneralInfoQueryOptions(username));
       } else if (asset === "LARYNX") {
-        return fetchQuery(getLarynxAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getLarynxAssetGeneralInfoQueryOptions(username));
       } else if (asset === "LP") {
-        return fetchQuery(getLarynxPowerAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getLarynxPowerAssetGeneralInfoQueryOptions(username));
       } else if (asset === "POINTS") {
-        return fetchQuery(getPointsAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getPointsAssetGeneralInfoQueryOptions(username));
       } else if (asset === "APT") {
-        return fetchQuery(getAptAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getAptAssetGeneralInfoQueryOptions(username));
       } else if (asset === "BNB") {
-        return fetchQuery(getBnbAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getBnbAssetGeneralInfoQueryOptions(username));
       } else if (asset === "BTC") {
-        return fetchQuery(getBtcAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getBtcAssetGeneralInfoQueryOptions(username));
       } else if (asset === "ETH") {
-        return fetchQuery(getEthAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getEthAssetGeneralInfoQueryOptions(username));
       } else if (asset === "SOL") {
-        return fetchQuery(getSolAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getSolAssetGeneralInfoQueryOptions(username));
       } else if (asset === "TON") {
-        return fetchQuery(getTonAssetGeneralInfoQueryOptions(username));
+        assetInfo = await fetchQuery(getTonAssetGeneralInfoQueryOptions(username));
       } else if (asset === "TRX") {
-        return fetchQuery(getTronAssetGeneralInfoQueryOptions(username));
-      }
-      const balances = await queryClient.ensureQueryData(
-        getHiveEngineTokensBalancesQueryOptions(username)
-      );
-      if (balances.some((balance) => balance.symbol === asset)) {
-        return await fetchQuery(
-          getHiveEngineTokenGeneralInfoQueryOptions(username, asset)
-        );
+        assetInfo = await fetchQuery(getTronAssetGeneralInfoQueryOptions(username));
       } else {
-        throw new Error(
-          "[SDK][Wallets] \u2013 has requested unrecognized asset info"
+        const balances = await queryClient.ensureQueryData(
+          getHiveEngineTokensBalancesQueryOptions(username)
         );
+        if (balances.some((balance) => balance.symbol === asset)) {
+          assetInfo = await fetchQuery(
+            getHiveEngineTokenGeneralInfoQueryOptions(username, asset)
+          );
+        } else {
+          throw new Error(
+            "[SDK][Wallets] \u2013 has requested unrecognized asset info"
+          );
+        }
       }
+      return await convertPriceToUserCurrency(assetInfo);
     }
   });
 }
@@ -3839,9 +3857,9 @@ function hasNonZeroSavingsBalance(parts) {
     )
   );
 }
-function getTokenOperationsQueryOptions(token, username, isForOwner = false) {
+function getTokenOperationsQueryOptions(token, username, isForOwner = false, currency = "usd") {
   return queryOptions({
-    queryKey: ["wallets", "token-operations", token, username, isForOwner],
+    queryKey: ["wallets", "token-operations", token, username, isForOwner, currency],
     queryFn: async () => {
       const queryClient = getQueryClient();
       const normalizedToken = token.toUpperCase();
@@ -3850,7 +3868,7 @@ function getTokenOperationsQueryOptions(token, username, isForOwner = false) {
       }
       try {
         const portfolio = await queryClient.fetchQuery(
-          getVisionPortfolioQueryOptions(username)
+          getVisionPortfolioQueryOptions(username, currency)
         );
         const assetEntry = portfolio.wallets.find(
           (assetItem) => assetItem.info.name === normalizedToken
@@ -4302,7 +4320,7 @@ function useWalletOperation(username, asset, operation, auth) {
       });
       setTimeout(
         () => getQueryClient().invalidateQueries({
-          queryKey: getVisionPortfolioQueryOptions(username).queryKey
+          queryKey: ["ecency-wallets", "portfolio", "v2", username]
         }),
         4e3
       );