@dynamic-labs/wallet-book 4.0.0-alpha.40 → 4.0.0-alpha.42

package/CHANGELOG.md

@@ -1,4 +1,23 @@
 
+## [4.0.0-alpha.42](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.41...v4.0.0-alpha.42) (2024-12-06)
+
+
+### Bug Fixes
+
+* walletbook loading issues ([#7553](https://github.com/dynamic-labs/dynamic-auth/issues/7553)) ([684ecc3](https://github.com/dynamic-labs/dynamic-auth/commit/684ecc32960e34680088d6cf200318336647ab77))
+
+## [4.0.0-alpha.41](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.40...v4.0.0-alpha.41) (2024-12-05)
+
+
+### Features
+
+* add shopify login ([04c6a9e](https://github.com/dynamic-labs/dynamic-auth/commit/04c6a9ee9d039d1480aa3b476ab382d7ea6dbaf2))
+
+
+### Bug Fixes
+
+* wallet group icon not rendering properly when no wallets with that same id are found ([#7543](https://github.com/dynamic-labs/dynamic-auth/issues/7543)) ([a26a629](https://github.com/dynamic-labs/dynamic-auth/commit/a26a6294bbe845147245cccc60a7fded49196db6))
+
 ## [4.0.0-alpha.40](https://github.com/dynamic-labs/dynamic-auth/compare/v4.0.0-alpha.39...v4.0.0-alpha.40) (2024-12-03)
 
 

package/package.cjs

@@ -3,6 +3,6 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var version = "4.0.0-alpha.40";
+var version = "4.0.0-alpha.42";
 
 exports.version = version;

package/package.js

@@ -1,4 +1,4 @@
 'use client'
-var version = "4.0.0-alpha.40";
+var version = "4.0.0-alpha.42";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/wallet-book",
-  "version": "4.0.0-alpha.40",
+  "version": "4.0.0-alpha.42",
   "author": "Dynamic Labs, Inc.",
   "license": "MIT",
   "main": "./src/index.cjs",
@@ -17,10 +17,10 @@
   },
   "dependencies": {
     "zod": "3.22.4",
-    "@dynamic-labs/assert-package-version": "4.0.0-alpha.40",
-    "@dynamic-labs/iconic": "4.0.0-alpha.40",
-    "@dynamic-labs/logger": "4.0.0-alpha.40",
-    "@dynamic-labs/utils": "4.0.0-alpha.40",
+    "@dynamic-labs/assert-package-version": "4.0.0-alpha.42",
+    "@dynamic-labs/iconic": "4.0.0-alpha.42",
+    "@dynamic-labs/logger": "4.0.0-alpha.42",
+    "@dynamic-labs/utils": "4.0.0-alpha.42",
     "eventemitter3": "5.0.1",
     "util": "0.12.5"
   },

package/src/components/WalletIcon.cjs

@@ -7,29 +7,29 @@ var _tslib = require('../../_virtual/_tslib.cjs');
 var react = require('react');
 var getWalletIconUrl = require('../helpers/getWalletIconUrl.cjs');
 require('../helpers/renderTemplate.cjs');
-var findWalletBookWallet = require('../helpers/findWalletBookWallet.cjs');
 require('../helpers/logger.cjs');
+var getWalletIconData = require('../helpers/getWalletIconData.cjs');
 var WalletBookContext = require('../context/WalletBookContext.cjs');
 
 const WalletBookWalletIcon = (_a) => {
-    var { walletKey, children } = _a, props = _tslib.__rest(_a, ["walletKey", "children"]);
+    var { walletKey, isGroup, children } = _a, props = _tslib.__rest(_a, ["walletKey", "isGroup", "children"]);
     const { walletBook } = WalletBookContext.useWalletBookContext();
-    const walletData = findWalletBookWallet.findWalletBookWallet(walletBook, walletKey);
     const [imgError, setImgError] = react.useState(false);
-    const walletIconUrl = getWalletIconUrl.getWalletIconUrl(walletBook, walletKey);
+    const { walletIconUrl, walletIconAlt } = getWalletIconData.getWalletIconData(walletBook, walletKey, isGroup);
     const defaultWalletIconUrl = getWalletIconUrl.getDefaultWalletIconUrl();
-    if (!walletData || !walletData.brand || !walletIconUrl) {
+    if (!walletIconUrl) {
         return react.createElement(react.Fragment, {}, children);
     }
     const onError = () => {
         setImgError(true);
     };
-    return react.createElement('img', Object.assign(Object.assign({ 'data-testid': `wallet-icon-${walletKey}` }, props), { alt: walletData.brand.alt, onError: onError, src: imgError ? defaultWalletIconUrl : walletIconUrl }), children);
+    return react.createElement('img', Object.assign(Object.assign({ 'data-testid': `wallet-icon-${walletKey}` }, props), { alt: walletIconAlt, onError: onError, src: imgError ? defaultWalletIconUrl : walletIconUrl }), children);
 };
 const WalletIcon = (_a) => {
-    var { icon, walletKey, children } = _a, props = _tslib.__rest(_a, ["icon", "walletKey", "children"]);
+    var { icon, walletKey, isGroup, children } = _a, props = _tslib.__rest(_a, ["icon", "walletKey", "isGroup", "children"]);
     if (!icon) {
         return react.createElement(WalletBookWalletIcon, Object.assign({ children,
+            isGroup,
             walletKey }, props));
     }
     return react.createElement('img', Object.assign(Object.assign({ 'data-testid': `wallet-icon-${walletKey}` }, props), { alt: walletKey, src: icon }), children);

package/src/components/WalletIcon.d.ts

@@ -3,9 +3,10 @@ type WalletIconProps = React.DetailedHTMLProps<React.ImgHTMLAttributes<HTMLImage
     icon?: string | undefined;
     walletKey: string | undefined;
     children?: ReactNode | any;
+    isGroup?: boolean;
 };
 type WalletBookWalletIconProps = Omit<WalletIconProps, 'icon' | 'iconUrl'>;
-export declare const WalletIcon: ({ icon, walletKey, children, ...props }: WalletIconProps) => React.FunctionComponentElement<WalletBookWalletIconProps> | React.DetailedReactHTMLElement<{
+export declare const WalletIcon: ({ icon, walletKey, isGroup, children, ...props }: WalletIconProps) => React.FunctionComponentElement<WalletBookWalletIconProps> | React.DetailedReactHTMLElement<{
     alt: string | undefined;
     src: string;
     ref?: React.LegacyRef<HTMLImageElement> | undefined;

package/src/components/WalletIcon.js

@@ -1,31 +1,31 @@
 'use client'
 import { __rest } from '../../_virtual/_tslib.js';
 import { createElement, useState, Fragment } from 'react';
-import { getWalletIconUrl, getDefaultWalletIconUrl } from '../helpers/getWalletIconUrl.js';
+import { getDefaultWalletIconUrl } from '../helpers/getWalletIconUrl.js';
 import '../helpers/renderTemplate.js';
-import { findWalletBookWallet } from '../helpers/findWalletBookWallet.js';
 import '../helpers/logger.js';
+import { getWalletIconData } from '../helpers/getWalletIconData.js';
 import { useWalletBookContext } from '../context/WalletBookContext.js';
 
 const WalletBookWalletIcon = (_a) => {
-    var { walletKey, children } = _a, props = __rest(_a, ["walletKey", "children"]);
+    var { walletKey, isGroup, children } = _a, props = __rest(_a, ["walletKey", "isGroup", "children"]);
     const { walletBook } = useWalletBookContext();
-    const walletData = findWalletBookWallet(walletBook, walletKey);
     const [imgError, setImgError] = useState(false);
-    const walletIconUrl = getWalletIconUrl(walletBook, walletKey);
+    const { walletIconUrl, walletIconAlt } = getWalletIconData(walletBook, walletKey, isGroup);
     const defaultWalletIconUrl = getDefaultWalletIconUrl();
-    if (!walletData || !walletData.brand || !walletIconUrl) {
+    if (!walletIconUrl) {
         return createElement(Fragment, {}, children);
     }
     const onError = () => {
         setImgError(true);
     };
-    return createElement('img', Object.assign(Object.assign({ 'data-testid': `wallet-icon-${walletKey}` }, props), { alt: walletData.brand.alt, onError: onError, src: imgError ? defaultWalletIconUrl : walletIconUrl }), children);
+    return createElement('img', Object.assign(Object.assign({ 'data-testid': `wallet-icon-${walletKey}` }, props), { alt: walletIconAlt, onError: onError, src: imgError ? defaultWalletIconUrl : walletIconUrl }), children);
 };
 const WalletIcon = (_a) => {
-    var { icon, walletKey, children } = _a, props = __rest(_a, ["icon", "walletKey", "children"]);
+    var { icon, walletKey, isGroup, children } = _a, props = __rest(_a, ["icon", "walletKey", "isGroup", "children"]);
     if (!icon) {
         return createElement(WalletBookWalletIcon, Object.assign({ children,
+            isGroup,
             walletKey }, props));
     }
     return createElement('img', Object.assign(Object.assign({ 'data-testid': `wallet-icon-${walletKey}` }, props), { alt: walletKey, src: icon }), children);

package/src/helpers/getWalletIconData.cjs

@@ -0,0 +1,39 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+var getWalletBookWallet = require('./getWalletBookWallet.cjs');
+var getBrandIconUrl = require('./getBrandIconUrl.cjs');
+var logger = require('./logger.cjs');
+var findWalletGroup = require('./findWalletGroup.cjs');
+
+const getWalletIconData = (walletBook, walletKey, isGroup) => {
+    if (!walletKey) {
+        return {
+            walletIconAlt: '',
+            walletIconUrl: '',
+        };
+    }
+    try {
+        const walletData = isGroup
+            ? findWalletGroup.findWalletGroup(walletBook, walletKey)
+            : getWalletBookWallet.getWalletBookWallet(walletBook, walletKey);
+        const iconData = walletData === null || walletData === void 0 ? void 0 : walletData.brand;
+        if (iconData) {
+            return {
+                walletIconAlt: iconData.alt,
+                walletIconUrl: getBrandIconUrl.getBrandIconUrl(iconData),
+            };
+        }
+    }
+    catch (err) {
+        logger.logger.error(err);
+    }
+    return {
+        walletIconAlt: '',
+        walletIconUrl: '',
+    };
+};
+
+exports.getWalletIconData = getWalletIconData;

package/src/helpers/getWalletIconData.d.ts

@@ -0,0 +1,5 @@
+import { WalletBookSchema } from '../schemas';
+export declare const getWalletIconData: (walletBook: WalletBookSchema, walletKey?: string, isGroup?: boolean) => {
+    walletIconAlt: string | undefined;
+    walletIconUrl: string | undefined;
+};

package/src/helpers/getWalletIconData.js

@@ -0,0 +1,35 @@
+'use client'
+import { getWalletBookWallet } from './getWalletBookWallet.js';
+import { getBrandIconUrl } from './getBrandIconUrl.js';
+import { logger } from './logger.js';
+import { findWalletGroup } from './findWalletGroup.js';
+
+const getWalletIconData = (walletBook, walletKey, isGroup) => {
+    if (!walletKey) {
+        return {
+            walletIconAlt: '',
+            walletIconUrl: '',
+        };
+    }
+    try {
+        const walletData = isGroup
+            ? findWalletGroup(walletBook, walletKey)
+            : getWalletBookWallet(walletBook, walletKey);
+        const iconData = walletData === null || walletData === void 0 ? void 0 : walletData.brand;
+        if (iconData) {
+            return {
+                walletIconAlt: iconData.alt,
+                walletIconUrl: getBrandIconUrl(iconData),
+            };
+        }
+    }
+    catch (err) {
+        logger.error(err);
+    }
+    return {
+        walletIconAlt: '',
+        walletIconUrl: '',
+    };
+};
+
+export { getWalletIconData };

package/src/helpers/index.d.ts

@@ -8,3 +8,5 @@ export * from './findWalletGroup';
 export * from './getWalletBookCdnUrl';
 export * from './getBrandIconUrl';
 export * from './findWalletGroupOverride';
+export * from './getWalletIconData';
+export * from './isWalletBookPopulated';

package/src/helpers/isWalletBookPopulated.cjs

@@ -0,0 +1,8 @@
+'use client'
+'use strict';
+
+Object.defineProperty(exports, '__esModule', { value: true });
+
+const isWalletBookPopulated = (walletBook) => { var _a; return Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length > 0; };
+
+exports.isWalletBookPopulated = isWalletBookPopulated;

package/src/helpers/isWalletBookPopulated.d.ts

@@ -0,0 +1,2 @@
+import { WalletBookSchema } from '../schemas/walletBookSchema';
+export declare const isWalletBookPopulated: (walletBook?: WalletBookSchema) => boolean;

package/src/helpers/isWalletBookPopulated.js

@@ -0,0 +1,4 @@
+'use client'
+const isWalletBookPopulated = (walletBook) => { var _a; return Object.keys((_a = walletBook === null || walletBook === void 0 ? void 0 : walletBook.wallets) !== null && _a !== void 0 ? _a : {}).length > 0; };
+
+export { isWalletBookPopulated };

package/src/index.cjs

@@ -16,6 +16,7 @@ var findWalletGroup = require('./helpers/findWalletGroup.cjs');
 var getWalletBookCdnUrl = require('./helpers/getWalletBookCdnUrl.cjs');
 var getBrandIconUrl = require('./helpers/getBrandIconUrl.cjs');
 var findWalletGroupOverride = require('./helpers/findWalletGroupOverride.cjs');
+var isWalletBookPopulated = require('./helpers/isWalletBookPopulated.cjs');
 var useWalletBookCdn = require('./hooks/useWalletBookCdn.cjs');
 var WalletIcon = require('./components/WalletIcon.cjs');
 var WalletBookContextProvider = require('./components/WalletBookContextProvider.cjs');
@@ -33,6 +34,7 @@ exports.findWalletGroup = findWalletGroup.findWalletGroup;
 exports.getWalletBookCdnUrl = getWalletBookCdnUrl.getWalletBookCdnUrl;
 exports.getBrandIconUrl = getBrandIconUrl.getBrandIconUrl;
 exports.findWalletGroupOverride = findWalletGroupOverride.findWalletGroupOverride;
+exports.isWalletBookPopulated = isWalletBookPopulated.isWalletBookPopulated;
 exports.useWalletBookCdn = useWalletBookCdn.useWalletBookCdn;
 exports.WalletIcon = WalletIcon.WalletIcon;
 exports.WalletBookContextProvider = WalletBookContextProvider.WalletBookContextProvider;

package/src/index.d.ts

@@ -10,7 +10,7 @@ export { useWalletBookContext } from './context/WalletBookContext';
 /**
  * HELPERS
  */
-export { getWalletBookWallet, getWalletIconUrl, getWalletGroup, getWalletBookCdnUrl, findWalletBookWallet, findWalletGroup, getBrandIconUrl, findWalletGroupOverride, renderTemplate, } from './helpers';
+export { getWalletBookWallet, getWalletIconUrl, getWalletGroup, getWalletBookCdnUrl, findWalletBookWallet, findWalletGroup, getBrandIconUrl, findWalletGroupOverride, renderTemplate, isWalletBookPopulated, } from './helpers';
 /**
  * HOOKS
  */

package/src/index.js

@@ -12,6 +12,7 @@ export { findWalletGroup } from './helpers/findWalletGroup.js';
 export { getWalletBookCdnUrl } from './helpers/getWalletBookCdnUrl.js';
 export { getBrandIconUrl } from './helpers/getBrandIconUrl.js';
 export { findWalletGroupOverride } from './helpers/findWalletGroupOverride.js';
+export { isWalletBookPopulated } from './helpers/isWalletBookPopulated.js';
 export { useWalletBookCdn } from './hooks/useWalletBookCdn.js';
 export { WalletIcon } from './components/WalletIcon.js';
 export { WalletBookContextProvider } from './components/WalletBookContextProvider.js';

package/wallet-book-fallbacks.cjs

@@ -132,6 +132,14 @@ var groups = {
 		key: "metamask",
 		name: "MetaMask"
 	},
+	nightly: {
+		brand: {
+			alt: "Nightly Wallet",
+			spriteId: "nightly"
+		},
+		key: "nightly",
+		name: "Nightly"
+	},
 	okxwallet: {
 		brand: {
 			alt: "OKX Wallet",
@@ -143,7 +151,7 @@ var groups = {
 	onekey: {
 		brand: {
 			alt: "OneKey Wallet",
-			spriteId: "12bebb3f-8030-4892-8452-c60a6bac1500"
+			spriteId: "onekey"
 		},
 		key: "onekey",
 		name: "OneKey"
@@ -1402,6 +1410,32 @@ var wallets = {
 		],
 		name: "Eden Online"
 	},
+	onekeybtc: {
+		brand: {
+			alt: "OneKey Wallet",
+			spriteId: "onekey"
+		},
+		chainGroup: "onekey",
+		desktop: {
+			chromeId: "jnmbobjmhlngoefaiojfljckilhhlhcj"
+		},
+		group: "onekey",
+		injectedConfig: [
+			{
+				chain: "btc",
+				extensionLocators: [
+				],
+				windowLocations: [
+					"$onekey.btc"
+				]
+			}
+		],
+		mobile: {
+			androidId: "so.onekey.app.wallet",
+			iosId: "id1609559473"
+		},
+		name: "OneKey"
+	},
 	intersend: {
 		brand: {
 			alt: "Intersend",

package/wallet-book-fallbacks.js

@@ -128,6 +128,14 @@ var groups = {
 		key: "metamask",
 		name: "MetaMask"
 	},
+	nightly: {
+		brand: {
+			alt: "Nightly Wallet",
+			spriteId: "nightly"
+		},
+		key: "nightly",
+		name: "Nightly"
+	},
 	okxwallet: {
 		brand: {
 			alt: "OKX Wallet",
@@ -139,7 +147,7 @@ var groups = {
 	onekey: {
 		brand: {
 			alt: "OneKey Wallet",
-			spriteId: "12bebb3f-8030-4892-8452-c60a6bac1500"
+			spriteId: "onekey"
 		},
 		key: "onekey",
 		name: "OneKey"
@@ -1398,6 +1406,32 @@ var wallets = {
 		],
 		name: "Eden Online"
 	},
+	onekeybtc: {
+		brand: {
+			alt: "OneKey Wallet",
+			spriteId: "onekey"
+		},
+		chainGroup: "onekey",
+		desktop: {
+			chromeId: "jnmbobjmhlngoefaiojfljckilhhlhcj"
+		},
+		group: "onekey",
+		injectedConfig: [
+			{
+				chain: "btc",
+				extensionLocators: [
+				],
+				windowLocations: [
+					"$onekey.btc"
+				]
+			}
+		],
+		mobile: {
+			androidId: "so.onekey.app.wallet",
+			iosId: "id1609559473"
+		},
+		name: "OneKey"
+	},
 	intersend: {
 		brand: {
 			alt: "Intersend",