@funkit/connect 6.14.0 → 6.14.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @funkit/connect
 
+## 6.14.2
+
+### Patch Changes
+
+- 014910c: Fix connected state detection by adding explicit isConnected field to user info
+
+## 6.14.1
+
+### Patch Changes
+
+- bc75836: Fix login state detection for external users in GeneralWalletProvider and remove redundant check in useRecentDirectExecutions
+
 ## 6.14.0
 
 ### Minor Changes

package/dist/consts/funkit.d.ts

@@ -44,6 +44,7 @@ export interface FunkitUserInfoBase {
     typeLabel: string;
     /** Profile picture url **/
     iconSrc: string;
+    isConnected: boolean;
 }
 export interface FunkitUserInfo extends FunkitUserInfoBase {
     address: Address;

package/dist/index.js

@@ -565,7 +565,8 @@ var PLACEHOLDER_FUNKIT_USER_INFO = {
   nameTruncated: "Guest",
   type: "unknown",
   typeLabel: "",
-  iconSrc: ""
+  iconSrc: "",
+  isConnected: false
 };
 
 // src/utils/funLogger.ts
@@ -1659,7 +1660,7 @@ function GeneralWalletProvider({ children }) {
   const { web2UserInfo, handleFunkitWeb2Logout } = useFunkitWeb2Login();
   const { externalUserId, apiKey } = useFunkitConfig();
   const loginType = !connector ? "guest" /* Guest */ : connector.id === FUNKIT_CONNECT_WALLET_ID ? "web2" /* Web2 */ : "web3" /* Web3 */;
-  const isUserLoggedIn = loginType !== "guest" /* Guest */;
+  const isUserLoggedIn = loginType !== "guest" /* Guest */ || !!externalUserId;
   const userInfo = useMemo4(() => {
     const id = externalUserId ? generateSyntheticUserId(apiKey, externalUserId) : address || "0x";
     if (!address) {
@@ -1683,7 +1684,8 @@ function GeneralWalletProvider({ children }) {
         nameTruncated: ensName ? formatENS(ensName) : formatAddress2(address),
         type: "eoa",
         typeLabel: connector?.name || "",
-        iconSrc: ensAvatar || ""
+        iconSrc: ensAvatar || "",
+        isConnected: true
       };
     }
     return PLACEHOLDER_FUNKIT_USER_INFO;
@@ -22023,11 +22025,12 @@ function usePaymentMethodEnablement({
   };
 }
 var usePaymentSources = (paymentMethodInfo, targetChainId, checkoutConfig) => {
-  const { isUserLoggedIn, walletAddress } = useGeneralWallet();
+  const { userInfo, walletAddress } = useGeneralWallet();
   const { data: allFiatAccounts } = useVirtualFiatAccounts();
   const matchingFiatAccount = useMatchingVirtualFiatAccount(allFiatAccounts);
   const { hasUsableBalance } = useWalletAssetHoldings(targetChainId);
   const { apiKey } = useFunkitConfig();
+  const isConnected = userInfo.isConnected;
   const { isFiatEnabled, isTokenTransferEnabled, isCardEnabled } = usePaymentMethodEnablement({ checkoutConfig });
   const accountPaymentMethodInfo = createPaymentMethodInfo({
     paymentMethod: "balance" /* ACCOUNT_BALANCE */,
@@ -22039,17 +22042,17 @@ var usePaymentSources = (paymentMethodInfo, targetChainId, checkoutConfig) => {
     bridgeCustomer: allFiatAccounts.bridgeCustomer
   }) : null;
   const showBalanceOption = isKatanaCustomer(apiKey) || hasUsableBalance;
-  const connectedAccountInfo = paymentMethodInfo?.paymentMethod !== "balance" /* ACCOUNT_BALANCE */ && isUserLoggedIn && showBalanceOption ? accountPaymentMethodInfo : null;
+  const connectedAccountInfo = paymentMethodInfo?.paymentMethod !== "balance" /* ACCOUNT_BALANCE */ && isConnected && showBalanceOption ? accountPaymentMethodInfo : null;
   const connected = [
     paymentMethodInfo,
     connectedAccountInfo,
     virtualBankPaymentMethodInfo
   ].filter(isNotNullish7);
-  const ignoreFallback = isUserLoggedIn && !hasUsableBalance;
+  const ignoreFallback = isConnected && !hasUsableBalance;
   const fallback2 = connected.length === 0 && !ignoreFallback ? isTokenTransferEnabled ? ["token_transfer" /* TOKEN_TRANSFER */] : isCardEnabled ? ["card" /* CARD */] : ["balance" /* ACCOUNT_BALANCE */] : [];
   const isTokenInNewSources = !fallback2.includes("token_transfer" /* TOKEN_TRANSFER */) && isTokenTransferEnabled;
-  const isWalletInNewSources = !isUserLoggedIn;
-  const isBankInNewSources = !matchingFiatAccount && isUserLoggedIn && isFiatEnabled;
+  const isWalletInNewSources = !isConnected;
+  const isBankInNewSources = !matchingFiatAccount && isConnected && isFiatEnabled;
   const newSources = [
     isTokenInNewSources && "token_transfer" /* TOKEN_TRANSFER */,
     !fallback2.includes("card" /* CARD */) && isCardEnabled && "card" /* CARD */,
@@ -22303,7 +22306,7 @@ function LoadingAccount({
   modalState,
   onNext
 }) {
-  const { walletAddress } = useGeneralWallet();
+  const { walletAddress, userInfo } = useGeneralWallet();
   const { apiKey } = useFunkitConfig();
   const { targetChainId, isDefiMode } = modalState;
   const { isLoading: isFetchingAssets, walletAssets } = useWalletAssets();
@@ -22327,7 +22330,7 @@ function LoadingAccount({
     if (isLoadingFlags || isLoadingFiat || !checkoutConfig) {
       return;
     }
-    if (startsOnSelectAssetStep) {
+    if (startsOnSelectAssetStep && userInfo.isConnected) {
       const paymentMethodInfo = createPaymentMethodInfo({
         paymentMethod: "balance" /* ACCOUNT_BALANCE */,
         walletAddress
@@ -22379,7 +22382,8 @@ function LoadingAccount({
     targetChainId,
     onNext,
     updateSelectedPaymentMethodInfo,
-    checkoutConfig
+    checkoutConfig,
+    userInfo.isConnected
   ]);
   return startsOnConfirmationStep ? /* @__PURE__ */ React150.createElement(ConfirmationStepLoading, null) : /* @__PURE__ */ React150.createElement(FunAssetLoading, { count: 5 });
 }
@@ -26952,7 +26956,7 @@ var useRecentCheckouts = ({
       ).sort((a, b) => b.createdTimeMs - a.createdTimeMs);
     },
     refetchInterval: listRefresh,
-    enabled: !!userInfo.id && isUserLoggedIn && isVisible
+    enabled: isUserLoggedIn && isVisible
   });
   return query;
 };
@@ -26973,7 +26977,7 @@ var useRecentDirectExecutions = ({
   isVisible,
   filterFunc = () => true
 }) => {
-  const { isUserLoggedIn, userInfo } = useGeneralWallet();
+  const { userInfo, isUserLoggedIn } = useGeneralWallet();
   const { apiKey } = useFunkitConfig();
   const { listRefresh } = useCheckoutRefreshInterval();
   const query = useQuery19({
@@ -26988,7 +26992,7 @@ var useRecentDirectExecutions = ({
       return directExecutions.filter((de) => isRecent2(de, defaultTimestampCutoff) && filterFunc(de)).sort((a, b) => b.createdTimeMs - a.createdTimeMs);
     },
     refetchInterval: listRefresh,
-    enabled: !!userInfo.id && isUserLoggedIn && isVisible
+    enabled: isUserLoggedIn && isVisible
   });
   return query;
 };
@@ -30691,7 +30695,8 @@ var FunkitWeb2Provider = ({
       nameTruncated,
       type,
       typeLabel,
-      iconSrc
+      iconSrc,
+      isConnected: true
     };
   }, [loggedInUser, loginMethod]);
   const contextValue = {
@@ -31630,7 +31635,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey5, version);
 }
 function getCurrentSdkVersion() {
-  return "6.14.0";
+  return "6.14.2";
 }
 function useFingerprint() {
   const fingerprint = useCallback50(() => {

package/dist/wallets/walletConnectors/bifrostWallet/bifrostWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   bifrostWallet
-} from "../chunk-A5N6B5UW.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-UIASLGLV.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   bifrostWallet
 };

package/dist/wallets/walletConnectors/bitgetWallet/bitgetWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   bitgetWallet
-} from "../chunk-TDAVGY5F.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-5W7VDOCL.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   bitgetWallet
 };

package/dist/wallets/walletConnectors/bybitWallet/bybitWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   bybitWallet
-} from "../chunk-2STUC6QL.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-LNEC5RNX.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   bybitWallet
 };

package/dist/wallets/walletConnectors/clvWallet/clvWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   clvWallet
-} from "../chunk-M3NZ6R2E.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-2GJQ4XZQ.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   clvWallet
 };

package/dist/wallets/walletConnectors/coin98Wallet/coin98Wallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   coin98Wallet
-} from "../chunk-OBOVHCEI.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-KIDC67XJ.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   coin98Wallet
 };

package/dist/wallets/walletConnectors/coreWallet/coreWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   coreWallet
-} from "../chunk-VR4TBQ6S.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-JCHN6A47.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   coreWallet
 };

package/dist/wallets/walletConnectors/foxWallet/foxWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   foxWallet
-} from "../chunk-7QONTUXT.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-CNPKISHN.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   foxWallet
 };

package/dist/wallets/walletConnectors/frontierWallet/frontierWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   frontierWallet
-} from "../chunk-TCAGNB4B.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-VWCLFMWJ.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   frontierWallet
 };

package/dist/wallets/walletConnectors/gateWallet/gateWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   gateWallet
-} from "../chunk-FKJJQNKX.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-CJGUM55H.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   gateWallet
 };

package/dist/wallets/walletConnectors/index.js

@@ -1,28 +1,28 @@
 "use client";
-import {
-  xdefiWallet
-} from "./chunk-BOU4WKRZ.js";
 import {
   zealWallet
 } from "./chunk-RNBEDQHF.js";
 import {
   zerionWallet
-} from "./chunk-SULRQO27.js";
-import {
-  subWallet
-} from "./chunk-JWFF4AAL.js";
+} from "./chunk-Q3H3TRBS.js";
 import {
-  tahoWallet
-} from "./chunk-ZZZRUXZE.js";
+  xdefiWallet
+} from "./chunk-BOU4WKRZ.js";
 import {
   talismanWallet
 } from "./chunk-DRO6WYMM.js";
+import {
+  safepalWallet
+} from "./chunk-EC6CHBSZ.js";
+import {
+  tahoWallet
+} from "./chunk-ZZZRUXZE.js";
 import {
   tokenPocketWallet
-} from "./chunk-2L43XSW3.js";
+} from "./chunk-J3LI3FYZ.js";
 import {
   trustWallet
-} from "./chunk-VYBAYMP3.js";
+} from "./chunk-RKPCWHXL.js";
 import {
   tokenaryWallet
 } from "./chunk-D6AOOO5F.js";
@@ -40,10 +40,13 @@ import {
 } from "./chunk-BBOM42DL.js";
 import {
   rainbowWallet
-} from "./chunk-2KUBG3S6.js";
+} from "./chunk-3CICVJUN.js";
 import {
   ramperWallet
 } from "./chunk-BYXPFMI7.js";
+import {
+  roninWallet
+} from "./chunk-QLVVUKYB.js";
 import {
   safeWallet
 } from "./chunk-BQQQL6UD.js";
@@ -51,50 +54,47 @@ import {
   safeheronWallet
 } from "./chunk-RZIO5TFF.js";
 import {
-  roninWallet
-} from "./chunk-NWIQNBJU.js";
-import {
-  safepalWallet
-} from "./chunk-NT2HYJKW.js";
+  subWallet
+} from "./chunk-ZSI5N4VV.js";
 import {
   metaMaskWallet
-} from "./chunk-2HYNUNAS.js";
-import {
-  ledgerWallet
-} from "./chunk-BRBKM4PW.js";
+} from "./chunk-UYGJO62F.js";
 import {
   mewWallet
 } from "./chunk-OL5ZO7E4.js";
 import {
   oktoWallet
 } from "./chunk-ADIXAKUL.js";
+import {
+  okxWallet
+} from "./chunk-AFXHGWBH.js";
 import {
   omniWallet
 } from "./chunk-7CUY5G6R.js";
+import {
+  ledgerWallet
+} from "./chunk-BRBKM4PW.js";
 import {
   oneInchWallet
 } from "./chunk-OESTDX6I.js";
-import {
-  okxWallet
-} from "./chunk-TDIEHTMB.js";
 import {
   oneKeyWallet
 } from "./chunk-SHBUZ7U7.js";
 import {
   foxWallet
-} from "./chunk-7QONTUXT.js";
-import {
-  frameWallet
-} from "./chunk-IFON7E6U.js";
+} from "./chunk-CNPKISHN.js";
 import {
   frontierWallet
-} from "./chunk-TCAGNB4B.js";
+} from "./chunk-VWCLFMWJ.js";
 import {
-  gateWallet
-} from "./chunk-FKJJQNKX.js";
+  frameWallet
+} from "./chunk-IFON7E6U.js";
 import {
   imTokenWallet
 } from "./chunk-COZ7MIQS.js";
+import {
+  gateWallet
+} from "./chunk-CJGUM55H.js";
 import {
   injectedWallet
 } from "./chunk-XWUJE7MW.js";
@@ -102,52 +102,52 @@ import {
   kresusWallet
 } from "./chunk-MJXPRJZT.js";
 import {
-  clvWallet
-} from "./chunk-M3NZ6R2E.js";
-import {
-  bloomWallet
-} from "./chunk-S27IADFU.js";
+  bybitWallet
+} from "./chunk-LNEC5RNX.js";
 import {
   coin98Wallet
-} from "./chunk-OBOVHCEI.js";
+} from "./chunk-KIDC67XJ.js";
+import {
+  coreWallet
+} from "./chunk-JCHN6A47.js";
+import {
+  dawnWallet
+} from "./chunk-HWPKCIBE.js";
 import {
   coinbaseWallet
 } from "./chunk-H4IRCEZN.js";
-import {
-  coreWallet
-} from "./chunk-VR4TBQ6S.js";
 import {
   desigWallet
 } from "./chunk-OPAZMNA7.js";
-import {
-  dawnWallet
-} from "./chunk-HWPKCIBE.js";
 import {
   enkryptWallet
 } from "./chunk-OLOIXTYS.js";
+import {
+  clvWallet
+} from "./chunk-2GJQ4XZQ.js";
 import {
   argentWallet
 } from "./chunk-WSQ2YJO2.js";
-import {
-  bitskiWallet
-} from "./chunk-HS3C7OQV.js";
 import {
   bifrostWallet
-} from "./chunk-A5N6B5UW.js";
+} from "./chunk-UIASLGLV.js";
 import {
   bitverseWallet
 } from "./chunk-3HZRRP4Y.js";
+import {
+  bitskiWallet
+} from "./chunk-HS3C7OQV.js";
 import {
   bitgetWallet
-} from "./chunk-TDAVGY5F.js";
+} from "./chunk-5W7VDOCL.js";
 import {
   braveWallet
 } from "./chunk-BPZ2XJO2.js";
+import "./chunk-DNSG5Q7V.js";
 import {
-  bybitWallet
-} from "./chunk-2STUC6QL.js";
+  bloomWallet
+} from "./chunk-S27IADFU.js";
 import "./chunk-23WIEY36.js";
-import "./chunk-DNSG5Q7V.js";
 export {
   argentWallet,
   bifrostWallet,

package/dist/wallets/walletConnectors/metaMaskWallet/metaMaskWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   metaMaskWallet
-} from "../chunk-2HYNUNAS.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-UYGJO62F.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   metaMaskWallet
 };

package/dist/wallets/walletConnectors/okxWallet/okxWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   okxWallet
-} from "../chunk-TDIEHTMB.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-AFXHGWBH.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   okxWallet
 };

package/dist/wallets/walletConnectors/rainbowWallet/rainbowWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   rainbowWallet
-} from "../chunk-2KUBG3S6.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-3CICVJUN.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   rainbowWallet
 };

package/dist/wallets/walletConnectors/roninWallet/roninWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   roninWallet
-} from "../chunk-NWIQNBJU.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-QLVVUKYB.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   roninWallet
 };

package/dist/wallets/walletConnectors/safepalWallet/safepalWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   safepalWallet
-} from "../chunk-NT2HYJKW.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-EC6CHBSZ.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   safepalWallet
 };

package/dist/wallets/walletConnectors/subWallet/subWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   subWallet
-} from "../chunk-JWFF4AAL.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-ZSI5N4VV.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   subWallet
 };

package/dist/wallets/walletConnectors/tokenPocketWallet/tokenPocketWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   tokenPocketWallet
-} from "../chunk-2L43XSW3.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-J3LI3FYZ.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   tokenPocketWallet
 };

package/dist/wallets/walletConnectors/trustWallet/trustWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   trustWallet
-} from "../chunk-VYBAYMP3.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-RKPCWHXL.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   trustWallet
 };

package/dist/wallets/walletConnectors/zerionWallet/zerionWallet.js

@@ -1,9 +1,9 @@
 "use client";
 import {
   zerionWallet
-} from "../chunk-SULRQO27.js";
-import "../chunk-23WIEY36.js";
+} from "../chunk-Q3H3TRBS.js";
 import "../chunk-DNSG5Q7V.js";
+import "../chunk-23WIEY36.js";
 export {
   zerionWallet
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkit/connect",
-  "version": "6.14.0",
+  "version": "6.14.2",
   "description": "Funkit Connect SDK elevates DeFi apps via web2 sign-ins and one-click checkouts.",
   "files": [
     "dist",
@@ -92,12 +92,12 @@
     "ua-parser-js": "^1.0.37",
     "use-debounce": "^10.0.5",
     "uuid": "^9.0.1",
+    "@funkit/utils": "1.1.11",
     "@funkit/api-base": "1.12.3",
     "@funkit/core": "2.3.48",
-    "@funkit/utils": "1.1.11",
-    "@funkit/chains": "0.4.0",
     "@funkit/wagmi-tools": "3.0.71",
-    "@funkit/fun-relay": "2.0.3"
+    "@funkit/fun-relay": "2.0.3",
+    "@funkit/chains": "0.4.0"
   },
   "repository": {
     "type": "git",