@dynamic-labs/multi-wallet 0.16.18 → 0.16.20

package/CHANGELOG.md

@@ -1,4 +1,18 @@
 
+### [0.16.20](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.19...v0.16.20) (2023-06-02)
+
+
+### Bug Fixes
+
+* flow connection status improvements ([#2212](https://github.com/dynamic-labs/DynamicAuth/issues/2212)) ([#2218](https://github.com/dynamic-labs/DynamicAuth/issues/2218)) ([8c3f9b3](https://github.com/dynamic-labs/DynamicAuth/commit/8c3f9b34b673d252cd696d271e8ee5a0457b2213))
+
+### [0.16.19](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.18...v0.16.19) (2023-06-01)
+
+
+### Bug Fixes
+
+* use wcv2 only if wallet supports it ([#2204](https://github.com/dynamic-labs/DynamicAuth/issues/2204)) ([f314d29](https://github.com/dynamic-labs/DynamicAuth/commit/f314d2940611fb130c43cb15526efe83e995d0ad))
+
 ### [0.16.18](https://github.com/dynamic-labs/DynamicAuth/compare/v0.16.17...v0.16.18) (2023-05-31)
 
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dynamic-labs/multi-wallet",
-  "version": "0.16.18",
+  "version": "0.16.20",
   "repository": {
     "type": "git",
     "url": "https://github.com/dynamic-labs/DynamicAuth.git",
@@ -28,8 +28,8 @@
     "magic-sdk": "^16.0.1",
     "@keplr-wallet/provider": "0.11.56",
     "@keplr-wallet/types": "^0.11.51",
-    "@dynamic-labs/logger": "0.16.18",
-    "@dynamic-labs/wallet-connector-core": "0.16.18"
+    "@dynamic-labs/logger": "0.16.20",
+    "@dynamic-labs/wallet-connector-core": "0.16.20"
   },
   "devDependencies": {
     "@walletconnect/types": "^2.2.1"

package/src/wallets/flow/flow-provider.cjs

@@ -7,31 +7,6 @@ var fcl = require('@onflow/fcl');
 var errors = require('../../errors.cjs');
 var logger = require('../../utils/logger.cjs');
 
-const get = (key) => {
-    if (typeof window === 'undefined') {
-        return undefined;
-    }
-    const value = window.localStorage.getItem(key);
-    try {
-        if (value) {
-            return JSON.parse(value);
-        }
-    }
-    catch (e) {
-        logger.logger.error(e);
-    }
-    return undefined;
-};
-const set = (key, value) => {
-    if (typeof window !== 'undefined') {
-        window.localStorage.setItem(key, JSON.stringify(value));
-    }
-};
-const LOCAL_STORAGE = {
-    can: true,
-    get: (key) => tslib.__awaiter(void 0, void 0, void 0, function* () { return get(key); }),
-    put: (key, value) => tslib.__awaiter(void 0, void 0, void 0, function* () { return set(key, value); }),
-};
 class FlowProvider {
     constructor({ appName, appLogoUrl, }) {
         this.appName = appName;
@@ -69,8 +44,7 @@ class FlowProvider {
             .put('app.detail.title', this.appName)
             .put('app.detail.icon', this.appLogoUrl)
             .put('accessNode.api', 'https://rest-mainnet.onflow.org')
-            .put('flow.network', 'mainnet')
-            .put('fcl.storage', LOCAL_STORAGE);
+            .put('flow.network', 'mainnet');
     }
     getDeepLink() {
         return undefined;
@@ -186,4 +160,3 @@ class FlowProvider {
 }
 
 exports.FlowProvider = FlowProvider;
-exports.LOCAL_STORAGE = LOCAL_STORAGE;

package/src/wallets/flow/flow-provider.d.ts

@@ -1,9 +1,4 @@
 import { WalletEventListeners } from '@dynamic-labs/wallet-connector-core';
-export declare const LOCAL_STORAGE: {
-    can: boolean;
-    get: (key: string) => Promise<any>;
-    put: (key: string, value: any) => Promise<void>;
-};
 export declare class FlowProvider {
     protected appName?: string;
     protected appLogoUrl?: string;

package/src/wallets/flow/flow-provider.js

@@ -3,31 +3,6 @@ import { currentUser, config, send, script, decode } from '@onflow/fcl';
 import { DynamicError } from '../../errors.js';
 import { logger } from '../../utils/logger.js';
 
-const get = (key) => {
-    if (typeof window === 'undefined') {
-        return undefined;
-    }
-    const value = window.localStorage.getItem(key);
-    try {
-        if (value) {
-            return JSON.parse(value);
-        }
-    }
-    catch (e) {
-        logger.error(e);
-    }
-    return undefined;
-};
-const set = (key, value) => {
-    if (typeof window !== 'undefined') {
-        window.localStorage.setItem(key, JSON.stringify(value));
-    }
-};
-const LOCAL_STORAGE = {
-    can: true,
-    get: (key) => __awaiter(void 0, void 0, void 0, function* () { return get(key); }),
-    put: (key, value) => __awaiter(void 0, void 0, void 0, function* () { return set(key, value); }),
-};
 class FlowProvider {
     constructor({ appName, appLogoUrl, }) {
         this.appName = appName;
@@ -65,8 +40,7 @@ class FlowProvider {
             .put('app.detail.title', this.appName)
             .put('app.detail.icon', this.appLogoUrl)
             .put('accessNode.api', 'https://rest-mainnet.onflow.org')
-            .put('flow.network', 'mainnet')
-            .put('fcl.storage', LOCAL_STORAGE);
+            .put('flow.network', 'mainnet');
     }
     getDeepLink() {
         return undefined;
@@ -181,4 +155,4 @@ class FlowProvider {
     }
 }
 
-export { FlowProvider, LOCAL_STORAGE };
+export { FlowProvider };

package/src/wallets/getMobileOrInjectedWallet.cjs

@@ -2,24 +2,29 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var walletBook = require('@dynamic-labs/wallet-book');
 var walletConnect = require('./walletConnect/walletConnect.cjs');
 var walletConnectV2 = require('./walletConnect/walletConnectV2.cjs');
 
 const getMobileOrInjectedWallet = ({ evmNetworks, injectedWallet, isWalletConnectV2 = false, walletConnectName, }) => {
+    var _a, _b;
     if (injectedWallet.isInstalledOnBrowser()) {
         return injectedWallet;
     }
-    else if (isWalletConnectV2) {
-        return new walletConnectV2["default"]({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
-    }
     else {
-        return new walletConnect({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
+        const wallet = walletBook.getWalletBookWallet(walletConnectName);
+        if (isWalletConnectV2 && ((_b = (_a = wallet.walletConnect) === null || _a === void 0 ? void 0 : _a.sdks) === null || _b === void 0 ? void 0 : _b.includes('sign_v2'))) {
+            return new walletConnectV2["default"]({
+                evmNetworks,
+                walletName: walletConnectName,
+            });
+        }
+        else {
+            return new walletConnect({
+                evmNetworks,
+                walletName: walletConnectName,
+            });
+        }
     }
 };
 

package/src/wallets/getMobileOrInjectedWallet.js

@@ -1,21 +1,26 @@
+import { getWalletBookWallet } from '@dynamic-labs/wallet-book';
 import WalletConnect from './walletConnect/walletConnect.js';
 import WalletConnectV2 from './walletConnect/walletConnectV2.js';
 
 const getMobileOrInjectedWallet = ({ evmNetworks, injectedWallet, isWalletConnectV2 = false, walletConnectName, }) => {
+    var _a, _b;
     if (injectedWallet.isInstalledOnBrowser()) {
         return injectedWallet;
     }
-    else if (isWalletConnectV2) {
-        return new WalletConnectV2({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
-    }
     else {
-        return new WalletConnect({
-            evmNetworks,
-            walletName: walletConnectName,
-        });
+        const wallet = getWalletBookWallet(walletConnectName);
+        if (isWalletConnectV2 && ((_b = (_a = wallet.walletConnect) === null || _a === void 0 ? void 0 : _a.sdks) === null || _b === void 0 ? void 0 : _b.includes('sign_v2'))) {
+            return new WalletConnectV2({
+                evmNetworks,
+                walletName: walletConnectName,
+            });
+        }
+        else {
+            return new WalletConnect({
+                evmNetworks,
+                walletName: walletConnectName,
+            });
+        }
     }
 };