@sundaeswap/wallet-lite 0.0.59 → 0.0.61

package/dist/types/utils/handles.d.ts

@@ -0,0 +1,5 @@
+import { IAssetAmountMetadata } from "@sundaeswap/asset";
+import { TAssetAmountMap } from "../@types/observer.js";
+import { THandleMetadata } from "../react-components/contexts/observer/types.js";
+export declare const getHandleMetadata: <AssetMetadata extends IAssetAmountMetadata = IAssetAmountMetadata>(balance: TAssetAmountMap<THandleMetadata<AssetMetadata>>, network: number) => Promise<TAssetAmountMap<THandleMetadata<AssetMetadata>>>;
+//# sourceMappingURL=handles.d.ts.map

package/dist/types/utils/handles.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"handles.d.ts","sourceRoot":"","sources":["../../../src/utils/handles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAExD,OAAO,EAAE,eAAe,EAAE,MAAM,gDAAgD,CAAC;AAIjF,eAAO,MAAM,iBAAiB,+EAGnB,gBAAgB,gBAAgB,aAAa,CAAC,CAAC,WAC/C,MAAM,6DAuDhB,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sundaeswap/wallet-lite",
-  "version": "0.0.59",
+  "version": "0.0.61",
   "license": "MIT",
   "type": "module",
   "main": "./dist/cjs/index.js",

package/src/index.ts

@@ -6,3 +6,4 @@ export * from "./react-components/hooks/index.js";
 export * from "./react-components/index.js";
 export * from "./utils/assets.js";
 export * from "./utils/getLibs.js";
+export * from "./utils/handles.js";

package/src/react-components/hooks/useWalletHandles.ts

@@ -1,105 +1,28 @@
-import type { IHandle } from "@koralabs/adahandle-sdk";
 import { IAssetAmountMetadata } from "@sundaeswap/asset";
-import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { useQuery } from "@tanstack/react-query";
 import { useMemo } from "react";
 
 import { TAssetAmountMap } from "../../@types/observer.js";
-import { WalletAssetMap } from "../../classes/WalletAssetMap.class.js";
-import { normalizeAssetIdWithDot } from "../../utils/assets.js";
-import { getHandleLib } from "../../utils/getLibs.js";
+import { getHandleMetadata } from "../../utils/handles.js";
 import { THandleMetadata } from "../contexts/observer/types.js";
 import { useWalletObserver } from "./useWalletObserver.js";
 
 export const useWalletHandles = <
   AssetMetadata extends IAssetAmountMetadata = IAssetAmountMetadata,
 >() => {
-  const queryClient = useQueryClient();
   const state = useWalletObserver<THandleMetadata<AssetMetadata>>();
   const memoizedHandleDep = useMemo(
     () => [...state.balance.getHandles().keys()],
     [state.balance],
   );
 
-  const queryKey = [memoizedHandleDep, state.mainAddress];
-  const { data: handles, isLoading } = useQuery({
+  const queryKey = [memoizedHandleDep, state.mainAddress, state.network];
+  const { data: handles, isLoading } = useQuery<
+    TAssetAmountMap<THandleMetadata<AssetMetadata>> | undefined
+  >({
     queryKey,
     queryFn: async () => {
-      const currentWalletHandles: TAssetAmountMap<
-        THandleMetadata<AssetMetadata>
-      > = new WalletAssetMap<THandleMetadata<AssetMetadata>>([
-        ...state.balance.getHandles(),
-      ]);
-
-      if (currentWalletHandles.size === 0) {
-        return [];
-      }
-
-      const cachedMetadata =
-        queryClient.getQueryData<
-          TAssetAmountMap<THandleMetadata<AssetMetadata>>
-        >(queryKey);
-
-      let updateMetadata = false;
-      if (cachedMetadata) {
-        for (const [, val] of cachedMetadata) {
-          if (!val?.metadata?.rarity) {
-            updateMetadata = true;
-            break;
-          }
-        }
-      }
-
-      if (!updateMetadata && cachedMetadata) {
-        return cachedMetadata;
-      }
-
-      try {
-        const { HandleClient, HandleClientContext, KoraLabsProvider } =
-          await getHandleLib();
-
-        const context =
-          state.network === 1
-            ? HandleClientContext.MAINNET
-            : HandleClientContext.PREVIEW;
-
-        const sdk = new HandleClient({
-          context,
-          provider: new KoraLabsProvider(context),
-        });
-
-        const walletHandlesWithDataArray = [...currentWalletHandles.entries()];
-        const walletHandleDataArray: IHandle[] = await sdk
-          .provider()
-          .getAllDataBatch(
-            walletHandlesWithDataArray.map(([key]) => ({
-              value: key.split(".")[1],
-            })),
-          );
-
-        walletHandlesWithDataArray.forEach(([key, asset]) => {
-          const matchingData = walletHandleDataArray.find(
-            ({ hex }) => hex === key.split(".")[1],
-          ) as IHandle;
-
-          currentWalletHandles.set(
-            normalizeAssetIdWithDot(key),
-            asset
-              .withMetadata({
-                ...matchingData,
-                ...asset.metadata,
-                assetId: normalizeAssetIdWithDot(asset.metadata.assetId),
-                decimals: 0,
-              })
-              .withAmount(1n),
-          );
-        });
-
-        return currentWalletHandles;
-      } catch (e) {
-        console.error(e);
-      }
-
-      return currentWalletHandles;
+      return getHandleMetadata(state.balance.getHandles(), state.network || 0);
     },
     refetchInterval: false,
     notifyOnChangeProps: ["data", "isLoading"],

package/src/utils/handles.ts

@@ -0,0 +1,69 @@
+import { IHandle } from "@koralabs/adahandle-sdk";
+import { IAssetAmountMetadata } from "@sundaeswap/asset";
+
+import { TAssetAmountMap } from "../@types/observer.js";
+import { WalletAssetMap } from "../classes/WalletAssetMap.class.js";
+import { THandleMetadata } from "../react-components/contexts/observer/types.js";
+import { normalizeAssetIdWithDot } from "./assets.js";
+import { getHandleLib } from "./getLibs.js";
+
+export const getHandleMetadata = async <
+  AssetMetadata extends IAssetAmountMetadata = IAssetAmountMetadata,
+>(
+  balance: TAssetAmountMap<THandleMetadata<AssetMetadata>>,
+  network: number,
+) => {
+  const currentWalletHandles: TAssetAmountMap<THandleMetadata<AssetMetadata>> =
+    new WalletAssetMap<THandleMetadata<AssetMetadata>>(balance);
+
+  // Abort early if no handles.
+  if (currentWalletHandles.size === 0) {
+    return currentWalletHandles;
+  }
+
+  try {
+    const { HandleClient, HandleClientContext, KoraLabsProvider } =
+      await getHandleLib();
+
+    const context =
+      network === 1 ? HandleClientContext.MAINNET : HandleClientContext.PREVIEW;
+
+    const sdk = new HandleClient({
+      context,
+      provider: new KoraLabsProvider(context),
+    });
+
+    const walletHandlesWithDataArray = [...currentWalletHandles.entries()];
+    const walletHandleDataArray: IHandle[] = await sdk
+      .provider()
+      .getAllDataBatch(
+        walletHandlesWithDataArray.map(([key]) => ({
+          value: key.split(".")[1],
+        })),
+      );
+
+    walletHandlesWithDataArray.forEach(([key, asset]) => {
+      const matchingData = walletHandleDataArray.find(
+        ({ hex }) => hex === key.split(".")[1],
+      ) as IHandle;
+
+      currentWalletHandles.set(
+        normalizeAssetIdWithDot(key),
+        asset
+          .withMetadata({
+            ...matchingData,
+            ...asset.metadata,
+            assetId: normalizeAssetIdWithDot(asset.metadata.assetId),
+            decimals: 0,
+          })
+          .withAmount(1n),
+      );
+    });
+
+    return currentWalletHandles;
+  } catch (e) {
+    console.error(e);
+  }
+
+  return currentWalletHandles;
+};