@lifi/widget 1.2.1 → 1.2.2

package/components/SwapButton/SwapButton.js

@@ -8,6 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jsx as _jsx } from "react/jsx-runtime";
+import { useWidgetConfig } from '@lifi/widget/providers/WidgetProvider';
 import { ChainId } from '@lifinance/sdk';
 import { useWatch } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
@@ -24,6 +25,8 @@ export const SwapButton = () => {
     const navigate = useNavigate();
     const { t } = useTranslation();
     const { getChainById } = useChains();
+    const config = useWidgetConfig();
+    const { connect: walletConnect } = useWallet();
     const { account, switchChain } = useWallet();
     const [currentRoute] = useCurrentRoute();
     const setExecutableRoute = useSetExecutableRoute();
@@ -35,7 +38,12 @@ export const SwapButton = () => {
     const isCurrentChainMatch = ((_a = getChainById(chainId || ChainId.ETH)) === null || _a === void 0 ? void 0 : _a.id) === account.chainId;
     const handleSwapButtonClick = () => __awaiter(void 0, void 0, void 0, function* () {
         if (!account.isActive) {
-            navigate(routes.selectWallet);
+            if (config.disableInternalWalletManagement) {
+                yield walletConnect();
+            }
+            else {
+                navigate(routes.selectWallet);
+            }
         }
         else if (!isCurrentChainMatch) {
             yield switchChain(chainId);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifi/widget",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "description": "LI.FI Widget for cross-chain bridging and swapping. It will drive your multi-chain strategy and attract new users from everywhere.",
   "sideEffects": false,
   "main": "./index.js",

package/providers/WalletProvider/WalletProvider.js

@@ -26,12 +26,24 @@ const initialContext = {
 const WalletContext = createContext(initialContext);
 export const useWallet = () => useContext(WalletContext);
 export const WalletProvider = ({ children }) => {
+    var _a;
     const config = useWidgetConfig();
     const { connect: walletManagementConnect, disconnect: walletManagementDisconnect, signer, } = useLifiWalletManagement();
     const [account, setAccount] = useState({});
+    useEffect(() => {
+        var _a;
+        console.log('walletProvider: signer changed', (_a = config.externalWalletManagementSettings) === null || _a === void 0 ? void 0 : _a.signer);
+        const updateSigner = () => __awaiter(void 0, void 0, void 0, function* () {
+            var _b;
+            const account = yield extractAccountFromSigner((_b = config.externalWalletManagementSettings) === null || _b === void 0 ? void 0 : _b.signer);
+            setAccount(account);
+            console.log('walletProvider: signer changed account', account);
+        });
+        updateSigner();
+    }, [(_a = config.externalWalletManagementSettings) === null || _a === void 0 ? void 0 : _a.signer]);
     const connect = useCallback((wallet) => __awaiter(void 0, void 0, void 0, function* () {
         if (config.disableInternalWalletManagement) {
-            const signer = yield config.walletCallbacks.connect();
+            const signer = yield config.externalWalletManagementSettings.connect();
             const account = yield extractAccountFromSigner(signer);
             setAccount(account);
             return;
@@ -39,50 +51,66 @@ export const WalletProvider = ({ children }) => {
         yield walletManagementConnect(wallet);
     }), [
         config.disableInternalWalletManagement,
-        config.walletCallbacks,
+        config.externalWalletManagementSettings,
         walletManagementConnect,
     ]);
     const disconnect = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         if (config.disableInternalWalletManagement) {
-            yield config.walletCallbacks.disconnect();
+            yield config.externalWalletManagementSettings.disconnect();
             setAccount({});
             return;
         }
         yield walletManagementDisconnect();
     }), [
         config.disableInternalWalletManagement,
-        config.walletCallbacks,
+        config.externalWalletManagementSettings,
         walletManagementDisconnect,
     ]);
     // only for injected wallets
     const switchChain = useCallback((chainId) => __awaiter(void 0, void 0, void 0, function* () {
         if (config.disableInternalWalletManagement) {
-            const signer = yield config.walletCallbacks.switchChain(chainId);
+            const signer = yield config.externalWalletManagementSettings.switchChain(chainId);
             const account = yield extractAccountFromSigner(signer);
             setAccount(account);
         }
         return walletSwitchChain(chainId);
-    }), [config.disableInternalWalletManagement, config.walletCallbacks]);
+    }), [
+        config.disableInternalWalletManagement,
+        config.externalWalletManagementSettings,
+    ]);
     const addChain = useCallback((chainId) => __awaiter(void 0, void 0, void 0, function* () {
         if (config.disableInternalWalletManagement) {
-            return config.walletCallbacks.addChain(chainId);
+            return config.externalWalletManagementSettings.addChain(chainId);
         }
         return walletAddChain(chainId);
-    }), [config.disableInternalWalletManagement, config.walletCallbacks]);
+    }), [
+        config.disableInternalWalletManagement,
+        config.externalWalletManagementSettings,
+    ]);
     const addToken = useCallback((chainId, token) => __awaiter(void 0, void 0, void 0, function* () {
         if (config.disableInternalWalletManagement) {
-            return config.walletCallbacks.addToken(token, chainId);
+            return config.externalWalletManagementSettings.addToken(token, chainId);
         }
         return switchChainAndAddToken(chainId, token);
-    }), [config.disableInternalWalletManagement, config.walletCallbacks]);
+    }), [
+        config.disableInternalWalletManagement,
+        config.externalWalletManagementSettings,
+    ]);
     const attemptEagerConnect = useCallback(() => __awaiter(void 0, void 0, void 0, function* () {
         if (config.disableInternalWalletManagement) {
-            const signer = yield config.walletCallbacks.provideSigner();
-            const account = yield extractAccountFromSigner(signer);
-            console.log(account);
-            setAccount((oldAccount) => (Object.assign({}, account)));
+            try {
+                const signer = yield config.externalWalletManagementSettings.provideSigner();
+                const account = yield extractAccountFromSigner(signer);
+                setAccount(() => (Object.assign({}, account)));
+            }
+            catch (e) {
+                console.warn('attempted eagerconnect', e);
+            }
         }
-    }), [config.disableInternalWalletManagement, config.walletCallbacks]);
+    }), [
+        config.disableInternalWalletManagement,
+        config.externalWalletManagementSettings,
+    ]);
     // keep account information up to date
     useEffect(() => {
         const updateAccount = () => __awaiter(void 0, void 0, void 0, function* () {

package/types/widget.d.ts

@@ -16,6 +16,7 @@ export interface WidgetWalletCallbacks {
     switchChain(reqChainId: number): Promise<Signer>;
     addToken(token: Token, chainId: number): Promise<void>;
     addChain(chainId: number): Promise<boolean>;
+    signer?: Signer;
 }
 interface WidgetConfigBase {
     fromAmount?: number;
@@ -41,10 +42,10 @@ declare type WidgetToTokenConfig = {
 };
 declare type WidgetWalletManagementConfig = {
     disableInternalWalletManagement: true;
-    walletCallbacks: WidgetWalletCallbacks;
+    externalWalletManagementSettings: WidgetWalletCallbacks;
 } | {
     disableInternalWalletManagement?: false;
-    walletCallbacks?: never;
+    externalWalletManagementSettings?: never;
 };
 export declare type WidgetConfig = WidgetConfigBase & WidgetFromTokenConfig & WidgetToTokenConfig & WidgetWalletManagementConfig;
 export {};