@funkit/connect 1.2.6 → 1.2.7

package/dist/index.js

@@ -2,12 +2,12 @@
 import {
   en_US_default
 } from "./chunk-SW6GAS7K.js";
-import {
-  darkTheme
-} from "./chunk-ICLRFHOV.js";
 import {
   lightTheme
 } from "./chunk-FRT63PFR.js";
+import {
+  darkTheme
+} from "./chunk-ICLRFHOV.js";
 import "./chunk-I24HX4XM.js";
 
 // src/components/ConnectButton/ConnectButton.tsx
@@ -141,10 +141,8 @@ import React143, {
 import { useConfig as useConfig5, useConnect as useConnect2, useDisconnect as useDisconnect3 } from "wagmi";
 
 // src/consts/funkit.ts
-import {
-  CheckoutState,
-  FUNKIT_CONNECT_CHECKOUT_NATIVE_CURRENCY_ADDRESS
-} from "@funkit/core";
+import { CheckoutState } from "@funkit/api-base";
+import { FUNKIT_CONNECT_CHECKOUT_NATIVE_CURRENCY_ADDRESS } from "@funkit/core";
 var NATIVE_TOKEN = FUNKIT_CONNECT_CHECKOUT_NATIVE_CURRENCY_ADDRESS;
 var FUNKIT_CONNECT_WALLET_ID = "funkitConnectWallet";
 var RESERVED_GROUP_NAME = "funkit-web2";
@@ -169,14 +167,24 @@ var IN_PROGRESS_CHECKOUT_STATES = [
 var TERMINAL_CHECKOUT_STATES = [
   CheckoutState.EXPIRED,
   CheckoutState.CHECKOUT_ERROR,
-  CheckoutState.COMPLETED
+  CheckoutState.COMPLETED,
+  CheckoutState.CANCELLED
 ];
+var FunkitSocialLoginMethod = /* @__PURE__ */ ((FunkitSocialLoginMethod2) => {
+  FunkitSocialLoginMethod2["GOOGLE"] = "google_oauth" /* google_oauth */;
+  FunkitSocialLoginMethod2["TWITTER"] = "twitter_oauth" /* twitter_oauth */;
+  FunkitSocialLoginMethod2["APPLE"] = "apple_oauth" /* apple_oauth */;
+  FunkitSocialLoginMethod2["FARCASTER"] = "farcaster" /* farcaster */;
+  return FunkitSocialLoginMethod2;
+})(FunkitSocialLoginMethod || {});
 var PLACEHOLDER_FUNKIT_USER_INFO = {
-  userId: null,
-  accountLabel: "Email",
-  accountName: "Loading...",
-  accountNameDisplay: "Loading...",
-  accountPicSrc: ""
+  id: "0x",
+  address: "0x",
+  name: "Guest",
+  nameTruncated: "Guest",
+  type: "unknown",
+  typeLabel: "",
+  iconSrc: ""
 };
 
 // src/utils/funLogger.ts
@@ -195,6 +203,9 @@ var FunLogger = class {
     this.apiKey = null;
     this.isDebugMode = false;
     this.userId = null;
+    this.userAddress = null;
+    this.userName = null;
+    this.userLoginType = null;
     this.sdkVersion = null;
   }
   getFunLogEnv() {
@@ -209,6 +220,9 @@ var FunLogger = class {
       data,
       apiKey: this.apiKey,
       userId: this.userId,
+      userName: this.userName,
+      userAddress: this.userAddress,
+      userLoginType: this.userLoginType,
       sdkVersion: this.sdkVersion
     };
   }
@@ -272,8 +286,20 @@ var FunLogger = class {
   getUserId() {
     return this.userId;
   }
-  setUserId(userId) {
+  getUserAddress() {
+    return this.userAddress;
+  }
+  getUserName() {
+    return this.userName;
+  }
+  getUserLoginType() {
+    return this.userLoginType;
+  }
+  setUserInfo(userId, userAddress, userName, userLoginType) {
     this.userId = userId;
+    this.userAddress = userAddress;
+    this.userName = userName;
+    this.userLoginType = userLoginType;
   }
 };
 datadogLogs.init({
@@ -314,6 +340,255 @@ import React5, {
 } from "react";
 import { useConfig } from "wagmi";
 
+// src/utils/memoize.ts
+var memoize = (fn) => {
+  const cache = /* @__PURE__ */ new Map();
+  const memoizedFn = (...args) => {
+    const key = JSON.stringify(args);
+    if (cache.has(key)) {
+      return cache.get(key);
+    }
+    const result = fn(...args);
+    cache.set(key, result);
+    return result;
+  };
+  memoizedFn.cache = cache;
+  return memoizedFn;
+};
+
+// src/utils/flags/config.ts
+var flagConfig = {
+  ["connect_sign_in_show_social_label" /* ConnectSignInShowSocialLabel */]: {
+    type: "boolean",
+    default_value: false,
+    overrides: [
+      {
+        if_any: [
+          {
+            key: "apiKey",
+            type: "isAnyOf",
+            values: ["hnHevQR0y394nBprGrvNx4HgoZHUwMet5mXTOBhf"]
+          }
+        ],
+        value: true
+      }
+    ]
+  }
+};
+
+// src/utils/flags/impl.ts
+import { datadogLogs as datadogLogs2 } from "@datadog/browser-logs";
+import fetch2 from "node-fetch";
+
+// src/utils/flags/endpoint.ts
+var FLAG_ENDPOINT_HOST = "sdk-cdn.fun.xyz";
+var FLAG_PROD_ENDPOINT_PATH = "flags/v0/config.json";
+var FLAG_PROD_ENDPOINT = `https://${FLAG_ENDPOINT_HOST}/${FLAG_PROD_ENDPOINT_PATH}`;
+
+// src/utils/flags/hash.ts
+var cyrb53 = (str, seed = 0) => {
+  let h1 = 3735928559 ^ seed;
+  let h2 = 1103547991 ^ seed;
+  for (let i = 0; i < str.length; i++) {
+    const ch = str.charCodeAt(i);
+    h1 = Math.imul(h1 ^ ch, 2654435761);
+    h2 = Math.imul(h2 ^ ch, 1597334677);
+  }
+  h1 = Math.imul(h1 ^ h1 >>> 16, 2246822507);
+  h1 ^= Math.imul(h2 ^ h2 >>> 13, 3266489909);
+  h2 = Math.imul(h2 ^ h2 >>> 16, 2246822507);
+  h2 ^= Math.imul(h1 ^ h1 >>> 13, 3266489909);
+  return 4294967296 * (2097151 & h2) + (h1 >>> 0);
+};
+var hashPct = (flag_key, value, pct) => {
+  const hashKey = `${flag_key}__${value}`;
+  return cyrb53(hashKey) % 100 < pct;
+};
+
+// src/utils/flags/impl.ts
+async function fetchWithTimeout(url, options = {}, timeout = 15e3) {
+  const controller = new AbortController();
+  const id = setTimeout(() => controller.abort(), timeout);
+  options.signal = controller.signal;
+  try {
+    const response = await fetch2(url, options);
+    clearTimeout(id);
+    return response;
+  } catch (error) {
+    if (error.name === "AbortError") {
+      throw new Error(`Request timed out after ${timeout / 1e3} seconds`);
+    }
+    throw error;
+  }
+}
+var warn = (...args) => {
+};
+var fetchConfigFromServer = async () => {
+  const response = await fetchWithTimeout(FLAG_PROD_ENDPOINT, {}, 5e3);
+  const configData = await response.json();
+  logger.log("flag_fetchConfigFromServer", {
+    configData
+  });
+  return configData.flags;
+};
+var FeatureFlag = class {
+  constructor(_config, fetchFlagConfig = fetchConfigFromServer) {
+    this._config = _config;
+    this.userContext = null;
+    this.derivedFlags = null;
+    this.isUsingOnlineConfig = false;
+    this.flagConfig = _config;
+    this.fetchFlagConfig = memoize(fetchFlagConfig);
+  }
+  static createForTesting(flags2, fetchFlagConfig) {
+    return new FeatureFlag(flags2, fetchFlagConfig);
+  }
+  async init(userContext) {
+    try {
+      if (!this.isUsingOnlineConfig) {
+        this.flagConfig = await this.fetchFlagConfig();
+        this.isUsingOnlineConfig = true;
+        this.deriveAllFlags(userContext);
+      }
+    } catch (err) {
+      warn("Failed to fetch config:", err);
+      this.flagConfig = this._config;
+      this.isUsingOnlineConfig = false;
+      this.deriveAllFlags(userContext);
+    } finally {
+    }
+  }
+  deriveAllFlags(userContext) {
+    if (this.userContext && this.userContext.apiKey === userContext.apiKey && this.userContext.userId === userContext.userId) {
+      return;
+    }
+    this.derivedFlags = Object.fromEntries(
+      Object.entries(this.flagConfig).map(([key, flag]) => [
+        key,
+        this.deriveFlag(key, flag, userContext)
+      ])
+    );
+    this.userContext = userContext;
+    logger.log("flag_deriveAllFlags", {
+      flags: this.derivedFlags,
+      userContext
+    });
+    datadogLogs2.setGlobalContextProperty("flags", this.derivedFlags);
+  }
+  deriveFlag(flagKey, flagConfig2, context) {
+    let finalValue = flagConfig2.default_value;
+    for (const override of flagConfig2.overrides || []) {
+      if (override.if_any.some(
+        (condition) => this.evalCondition(flagKey, condition, context)
+      )) {
+        finalValue = override.value;
+        break;
+      }
+    }
+    return finalValue;
+  }
+  evalCondition(flagKey, condition, context) {
+    var _a, _b;
+    const needle = condition.key === "userId" ? context.userId : context.apiKey;
+    if (!needle) {
+      return false;
+    }
+    switch (condition.type) {
+      case "pctRollout": {
+        return hashPct(flagKey, needle, condition.pct);
+      }
+      case "isAnyOf": {
+        return (_b = (_a = condition.values) == null ? void 0 : _a.includes(needle)) != null ? _b : false;
+      }
+      default: {
+      }
+    }
+    const _ = condition;
+    throw new Error(`Unknown condition type: ${JSON.stringify(_)}`);
+  }
+  getBool(flagKey, fallback) {
+    var _a;
+    if (this.derivedFlags === null) {
+      logger.warn("flag_notInitialized", {
+        flagKey,
+        fallback
+      });
+      return fallback;
+    }
+    const flagValue = (_a = this.derivedFlags) == null ? void 0 : _a[flagKey];
+    return typeof flagValue === "boolean" ? flagValue : fallback;
+  }
+  getNumber(flagKey, fallback) {
+    var _a;
+    if (this.derivedFlags === null) {
+      logger.warn("flag_notInitialized", {
+        flagKey,
+        fallback
+      });
+      return fallback;
+    }
+    const flagValue = (_a = this.derivedFlags) == null ? void 0 : _a[flagKey];
+    return typeof flagValue === "number" ? flagValue : fallback;
+  }
+  getString(flagKey, fallback) {
+    var _a;
+    if (this.derivedFlags === null) {
+      logger.warn("flag_notInitialized", {
+        flagKey,
+        fallback
+      });
+      return fallback;
+    }
+    const flagValue = (_a = this.derivedFlags) == null ? void 0 : _a[flagKey];
+    return typeof flagValue === "string" ? flagValue : fallback;
+  }
+};
+
+// src/utils/flags/index.ts
+var singleton = new FeatureFlag(flagConfig);
+var getBool = memoize((...args) => {
+  const result = singleton.getBool(...args);
+  logger.log("flag_exposure", {
+    flagKey: args[0],
+    fallback: args[1],
+    flagValue: result,
+    type: "bool"
+  });
+  return result;
+});
+var getNumber = memoize((...args) => {
+  const result = singleton.getNumber(...args);
+  logger.log("flag_exposure", {
+    flagKey: args[0],
+    fallback: args[1],
+    flagValue: result,
+    type: "number"
+  });
+  return result;
+});
+var getString = memoize((...args) => {
+  const result = singleton.getString(...args);
+  logger.log("flag_exposure", {
+    flagKey: args[0],
+    fallback: args[1],
+    flagValue: result,
+    type: "string"
+  });
+  return result;
+});
+var init = (context) => {
+  singleton.init(context);
+  getBool.cache = /* @__PURE__ */ new Map();
+  getNumber.cache = /* @__PURE__ */ new Map();
+  getString.cache = /* @__PURE__ */ new Map();
+};
+var flags = {
+  init,
+  getBool,
+  getNumber,
+  getString
+};
+
 // src/components/FunkitProvider/FunkitConfigContext.tsx
 import React4, { createContext as createContext2, useContext as useContext2, useMemo as useMemo2 } from "react";
 
@@ -793,7 +1068,12 @@ function FunkitConnectChainProvider({
       configureEnvironment({
         chain: initialChainFinal,
         apiKey
-      }).then(() => logger.log("Core configured"));
+      }).then(() => {
+        logger.log("Core configured");
+        flags.init({
+          apiKey
+        });
+      });
     }
   }, [apiKey, initialChainFinal]);
   return /* @__PURE__ */ React5.createElement(FunkitConnectChainContext.Provider, {
@@ -1497,7 +1777,7 @@ var GeneralWalletContext = createContext7({
   isUserLoggedIn: false,
   isWeb2Login: false,
   isWeb3Login: false,
-  userInfo: { ...PLACEHOLDER_FUNKIT_USER_INFO, globalFunkitUserId: "" },
+  userInfo: PLACEHOLDER_FUNKIT_USER_INFO,
   isFetchingAssets: false,
   walletAssets: null,
   startAssetsListener: () => void 0,
@@ -1511,7 +1791,7 @@ function GeneralWalletProvider({ children }) {
   const { address, connector, isConnected, chain: activeChain } = useAccount2();
   const { connectors, disconnectAsync } = useDisconnect();
   const ensName = useMainnetEnsName(address);
-  const { web2AccountInfo, handleFunkitWeb2Logout } = useFunkitWeb2Login();
+  const { web2UserInfo, handleFunkitWeb2Logout } = useFunkitWeb2Login();
   const { apiKey, accountModalConfig, paymentsConfig } = useFunkitConfig();
   const isWeb2Login = useMemo4(() => {
     return connector && connector.id === FUNKIT_CONNECT_WALLET_ID;
@@ -1523,37 +1803,46 @@ function GeneralWalletProvider({ children }) {
     return isWeb2Login || isWeb3Login;
   }, [isWeb2Login, isWeb3Login]);
   const userInfo = useMemo4(() => {
-    let baseInfo;
-    if (isWeb2Login) {
-      baseInfo = web2AccountInfo;
-    } else if (isWeb3Login) {
-      baseInfo = {
-        userId: address,
-        accountLabel: connector == null ? void 0 : connector.name,
-        accountName: ensName ? ensName : address,
-        accountNameDisplay: ensName ? formatENS(ensName) : formatAddress(address || "")
+    if (!address)
+      return PLACEHOLDER_FUNKIT_USER_INFO;
+    if (isWeb2Login)
+      return {
+        ...web2UserInfo,
+        address
+      };
+    if (isWeb3Login) {
+      return {
+        id: address,
+        address,
+        name: ensName ? ensName : address,
+        nameTruncated: ensName ? formatENS(ensName) : formatAddress(address || ""),
+        type: "eoa",
+        typeLabel: (connector == null ? void 0 : connector.name) || "",
+        iconSrc: ""
       };
-    } else {
-      baseInfo = PLACEHOLDER_FUNKIT_USER_INFO;
     }
-    return {
-      ...baseInfo,
-      globalFunkitUserId: isUserLoggedIn ? `${address}|${baseInfo.accountName}|${apiKey}` : `0x|UnknownGuest|${apiKey}`
-    };
+    return PLACEHOLDER_FUNKIT_USER_INFO;
   }, [
     address,
-    apiKey,
     connector == null ? void 0 : connector.name,
     ensName,
-    isUserLoggedIn,
     isWeb2Login,
     isWeb3Login,
-    web2AccountInfo
+    web2UserInfo
   ]);
   useEffect6(() => {
-    if (userInfo.globalFunkitUserId !== logger.getUserId()) {
-      logger.log("settingUserId", { newUserId: userInfo.globalFunkitUserId });
-      logger.setUserId(userInfo.globalFunkitUserId);
+    if (userInfo.id !== logger.getUserId() || userInfo.address !== logger.getUserAddress() || userInfo.name !== logger.getUserName() || userInfo.type !== logger.getUserLoginType()) {
+      logger.log("settingUserInfo", userInfo);
+      logger.setUserInfo(
+        userInfo.id,
+        userInfo.address,
+        userInfo.name,
+        userInfo.type
+      );
+      void flags.init({
+        apiKey,
+        userId: userInfo.id
+      });
     }
   }, [userInfo]);
   const intervalRef = useRef2();
@@ -1600,7 +1889,7 @@ function GeneralWalletProvider({ children }) {
         setIsFetchingAssets(false);
       }
     }
-  }, [isConnected, address, accountModalConfig.showUnknownTokens]);
+  }, [isConnected, address, apiKey, accountModalConfig.showUnknownTokens]);
   useEffect6(() => {
     _fetchAssetsIfPossible();
   }, [refreshSymbol, activeChain]);
@@ -1861,6 +2150,7 @@ import React91, { useCallback as useCallback22, useMemo as useMemo26, useState a
 
 // src/components/FunkitProvider/FunkitCheckoutContext.tsx
 import {
+  CheckoutState as CheckoutState3,
   getAssetPriceInfo as getAssetPriceInfo2,
   getCheckoutByDepositAddress,
   getCheckoutQuote as getApiCheckoutQuote,
@@ -1966,10 +2256,12 @@ function generateQuoteApiErrorForDisplay(errorMessage = "") {
 }
 
 // src/utils/checkout.ts
-import { getAssetPriceInfo } from "@funkit/api-base";
 import {
-  CHECKOUT_SPONSOR_SUPPORT_CHAINS,
   CheckoutState as CheckoutState2,
+  getAssetPriceInfo
+} from "@funkit/api-base";
+import {
+  CHECKOUT_SPONSOR_SUPPORT_CHAINS,
   CONTRACT_ADDRESSES,
   FUNKIT_CONNECT_CHECKOUT_NATIVE_CURRENCY_ADDRESS as FUNKIT_CONNECT_CHECKOUT_NATIVE_CURRENCY_ADDRESS2,
   FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO as FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO3,
@@ -2592,7 +2884,7 @@ function FunkitCheckoutProvider({ children }) {
         newCheckoutHistoryList = singleCheckoutHistory ? [singleCheckoutHistory] : [];
       }
       setCheckoutHistoryList(
-        newCheckoutHistoryList.sort((a, b) => b.createdTimeMs - a.createdTimeMs)
+        newCheckoutHistoryList.filter((item) => item.state !== CheckoutState3.CANCELLED).sort((a, b) => b.createdTimeMs - a.createdTimeMs)
       );
       setIsCheckoutHistoryInited(true);
     } catch (err) {
@@ -3696,12 +3988,12 @@ var animateContentInClass = "stgjxl2";
 var animateContentOutClass = "stgjxl3";
 
 // src/hooks/useCheckoutStateBooleans.ts
-import { CheckoutState as CheckoutState3 } from "@funkit/core";
+import { CheckoutState as CheckoutState4 } from "@funkit/api-base";
 function useCheckoutStateBooleans(checkoutState) {
   const isProcessing = IN_PROGRESS_CHECKOUT_STATES.includes(checkoutState);
-  const isCompleted = checkoutState === CheckoutState3.COMPLETED;
-  const isError = checkoutState === CheckoutState3.CHECKOUT_ERROR;
-  const isExpired = checkoutState === CheckoutState3.EXPIRED;
+  const isCompleted = checkoutState === CheckoutState4.COMPLETED;
+  const isError = checkoutState === CheckoutState4.CHECKOUT_ERROR;
+  const isExpired = checkoutState === CheckoutState4.EXPIRED;
   const isFailed = isError || isExpired;
   const isTerminal = TERMINAL_CHECKOUT_STATES.includes(checkoutState);
   return {
@@ -4543,7 +4835,6 @@ import {
 } from "@funkit/api-base";
 import { FUNKIT_CONNECT_SUPPORTED_CHAINS_ID_LIST } from "@funkit/core";
 var FUNKIT_MESH_CLIENT_ID = "8132aff4-56c9-4b1d-85b4-08dbdcc6199d";
-var MESH_DEFAULT_USER_ID = "meshconnectkit";
 var MeshExchanges = /* @__PURE__ */ ((MeshExchanges4) => {
   MeshExchanges4["Robinhood"] = "Robinhood";
   MeshExchanges4["ETrade"] = "ETrade";
@@ -4726,6 +5017,7 @@ function useFunkitMesh({
   onMeshModalClose
 }) {
   const { apiKey } = useFunkitConfig();
+  const { userInfo } = useGeneralWallet();
   const { meshBrokerDataMap, setDataMapAndCache } = useContext10(FunkitMeshContext);
   const handleIntegrationConnected = useCallback10(
     (brokerData) => {
@@ -4770,7 +5062,7 @@ function useFunkitMesh({
         onConnected == null ? void 0 : onConnected(meshBrokerDataMap[brokerage]);
       } else {
         const response = await fetchMeshLinkToken(
-          MESH_DEFAULT_USER_ID,
+          userInfo.id,
           brokerage,
           apiKey
         );
@@ -4788,7 +5080,8 @@ function useFunkitMesh({
       hasActiveConnectionCheck,
       meshBrokerDataMap,
       onBeforeConnect,
-      onConnected
+      onConnected,
+      userInfo.id
     ]
   );
   const unlinkBrokerage = useCallback10(
@@ -6436,7 +6729,7 @@ function FunPaymentMoonpayType({
     },
     theme: active2.moonpayTheme,
     colorCode: moonpayButtonColor,
-    externalCustomerId: userInfo.globalFunkitUserId
+    externalCustomerId: userInfo.id
   })), paymentFlow === 0 /* DEPOSIT */ ? /* @__PURE__ */ React59.createElement(Box, {
     width: "full"
   }, /* @__PURE__ */ React59.createElement(FunButton, {
@@ -9720,9 +10013,7 @@ function CheckoutPrimaryInfo({
 }
 
 // src/components/FunTransactionSummary/FunTxSummaryHistory.tsx
-import {
-  FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO as FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO9
-} from "@funkit/core";
+import { FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO as FUNKIT_CONNECT_SUPPORTED_CHAINS_INFO9 } from "@funkit/core";
 import React87, { useMemo as useMemo24 } from "react";
 
 // src/components/Icons/RedirectIcon.tsx
@@ -10183,7 +10474,13 @@ function FunCheckoutHistoryHelp({
 
   App ID: ${apiKey}
 
-  User ID: ${userInfo.globalFunkitUserId}
+  User ID: ${userInfo.id}
+
+  User Name: ${userInfo.name}
+
+  User Address: ${userInfo.address}
+
+  Checkout Recipient Address: ${checkoutHistoryInfo.recipientAddr}
 
   =========================
 
@@ -10390,7 +10687,7 @@ function FunCheckoutHistoryContent({
 }
 
 // src/components/ProfileDetails/FunProfileViews/ActivityHistory/ActivityHistory.tsx
-import { CheckoutState as CheckoutState4 } from "@funkit/core";
+import { CheckoutState as CheckoutState5 } from "@funkit/api-base";
 import React95, { useEffect as useEffect22, useMemo as useMemo28, useState as useState27 } from "react";
 
 // src/components/FunNotification/FunCheckoutNotification.tsx
@@ -10654,11 +10951,11 @@ function ActivityHistory({
       });
     } else if (activeTab === "Failed" /* FAILED */) {
       sortedList = [
-        ...checkoutHistoryStateMap[CheckoutState4.EXPIRED],
-        ...checkoutHistoryStateMap[CheckoutState4.CHECKOUT_ERROR]
+        ...checkoutHistoryStateMap[CheckoutState5.EXPIRED],
+        ...checkoutHistoryStateMap[CheckoutState5.CHECKOUT_ERROR]
       ];
     } else if (activeTab === "Completed" /* COMPLETED */) {
-      sortedList = checkoutHistoryStateMap[CheckoutState4.COMPLETED];
+      sortedList = checkoutHistoryStateMap[CheckoutState5.COMPLETED];
     }
     return sortedList.sort((a, b) => b.createdTimeMs - a.createdTimeMs);
   }, [activeTab, checkoutHistoryList, checkoutHistoryStateMap]);
@@ -11085,7 +11382,7 @@ var ProfileTitleSection = ({
     className: animateOut ? animateAvatarOutClass : animateAvatarInClass
   }, /* @__PURE__ */ React105.createElement(Avatar, {
     address: account.address,
-    imageUrl: account.ensAvatar || userInfo.accountPicSrc,
+    imageUrl: account.ensAvatar || userInfo.iconSrc,
     loading: account.hasPendingTransactions,
     size: 24
   })), /* @__PURE__ */ React105.createElement(Text, {
@@ -11093,7 +11390,7 @@ var ProfileTitleSection = ({
     size: "16",
     weight: "semibold",
     className: animateOut ? animateTitleOutClass2 : animateTitleInClass2
-  }, userInfo.accountNameDisplay)), /* @__PURE__ */ React105.createElement(Box, {
+  }, userInfo.nameTruncated)), /* @__PURE__ */ React105.createElement(Box, {
     display: "flex",
     alignItems: "center",
     flexDirection: "row",
@@ -11295,8 +11592,8 @@ function Settings({
     paddingBottom: "28",
     className: animateOut ? animateContentOutClass : animateContentInClass
   }, /* @__PURE__ */ React106.createElement(LineItem, {
-    label: isWeb3Login ? "Wallet" : userInfo.accountLabel,
-    value: isWeb3Login ? userInfo.accountLabel : userInfo.accountName
+    label: isWeb3Login ? "Wallet" : userInfo.typeLabel,
+    value: isWeb3Login ? userInfo.typeLabel : userInfo.name
   }), /* @__PURE__ */ React106.createElement(LineItem, {
     label: "Address",
     value: formatAddress(walletAddress),
@@ -12438,7 +12735,15 @@ function FunSignInStep({
     display: "flex",
     flexDirection: "column",
     gap: "14"
-  }, /* @__PURE__ */ React118.createElement(Box, {
+  }, flags.getBool("connect_sign_in_show_social_label" /* ConnectSignInShowSocialLabel */, false) ? /* @__PURE__ */ React118.createElement(Box, {
+    display: "flex",
+    justifyContent: "center",
+    width: "full"
+  }, /* @__PURE__ */ React118.createElement(Text, {
+    size: "14",
+    color: "modalTextSecondary",
+    weight: "medium"
+  }, "or continue with")) : null, /* @__PURE__ */ React118.createElement(Box, {
     display: "flex",
     gap: "10"
   }, ENABLED_SOCIAL_ITEMS.map((socialItem) => /* @__PURE__ */ React118.createElement(FunIconButton, {
@@ -15097,7 +15402,7 @@ var FunkitWeb2Context = createContext19({
   loginErrorMessage: "",
   clearLoginError: () => void 0,
   handleFunkitWeb2Logout: () => Promise.resolve(void 0),
-  web2AccountInfo: PLACEHOLDER_FUNKIT_USER_INFO
+  web2UserInfo: PLACEHOLDER_FUNKIT_USER_INFO
 });
 var LOGIN_METHOD_CACHE = "privy:login:method";
 var PRIVY_AUTH_URL = "https://auth.privy.io";
@@ -15105,13 +15410,6 @@ var PRIVY_IFRAME_ID = "privy-funkit-iframe";
 var PRIVY_OAUTH_CODE_URL_PARAM = "privy_oauth_code";
 var PRIVY_OAUTH_STATE_URL_PARAM = "privy_oauth_state";
 var RESEND_EMAIL_TIMEOUT_MS = 3e3;
-var FunkitSocialLoginMethod = /* @__PURE__ */ ((FunkitSocialLoginMethod2) => {
-  FunkitSocialLoginMethod2["GOOGLE"] = "google_oauth" /* google_oauth */;
-  FunkitSocialLoginMethod2["TWITTER"] = "twitter_oauth" /* twitter_oauth */;
-  FunkitSocialLoginMethod2["APPLE"] = "apple_oauth" /* apple_oauth */;
-  FunkitSocialLoginMethod2["FARCASTER"] = "farcaster" /* farcaster */;
-  return FunkitSocialLoginMethod2;
-})(FunkitSocialLoginMethod || {});
 var getLoginMethodFromCache = () => {
   try {
     return window.localStorage.getItem(LOGIN_METHOD_CACHE) || "";
@@ -15158,7 +15456,7 @@ var FunkitWeb2Provider = ({
     });
     setPrivyIframeUrl(newPrivy.embeddedWallet.getURL());
     setPrivy(newPrivy);
-  }, [funkitConfig.privyAppId]);
+  }, [chains, funkitConfig.privyAppId]);
   const handleIframeMessage = useCallback31(
     (e) => {
       if (e.origin === PRIVY_AUTH_URL && privy) {
@@ -15470,69 +15768,60 @@ var FunkitWeb2Provider = ({
     },
     [privy]
   );
-  const userAccountInfo = useMemo35(() => {
-    if (loggedInUser && loggedInUser.linked_accounts && loggedInUser.linked_accounts.length > 0) {
-      const loggedInAccount = loggedInUser.linked_accounts.find(
-        (account) => (account == null ? void 0 : account.type) === loginMethod
-      );
-      if (!loggedInAccount)
-        return PLACEHOLDER_FUNKIT_USER_INFO;
-      switch (loggedInAccount.type) {
-        case "email" /* email */:
-          return {
-            userId: loggedInAccount.address,
-            accountLabel: "Email",
-            accountName: loggedInAccount.address,
-            accountNameDisplay: formatAccountName(
-              loggedInAccount.address,
-              true
-            ),
-            accountPicSrc: ""
-          };
-        case "farcaster" /* farcaster */:
-          return {
-            userId: `@${loggedInAccount.username}`,
-            accountLabel: "Farcaster ID",
-            accountName: `@${loggedInAccount.username}`,
-            accountNameDisplay: formatAccountName(
-              `@${loggedInAccount.username}`,
-              false
-            ),
-            accountPicSrc: loggedInAccount.profile_picture_url || ""
-          };
-        case "google_oauth" /* google_oauth */:
-          return {
-            userId: loggedInAccount.email,
-            accountLabel: "Email",
-            accountName: loggedInAccount.email,
-            accountNameDisplay: formatAccountName(loggedInAccount.email, true),
-            accountPicSrc: ""
-          };
-        case "twitter_oauth" /* twitter_oauth */:
-          return {
-            userId: `@${loggedInAccount.username}`,
-            accountLabel: "Twitter ID",
-            accountName: `@${loggedInAccount.username}`,
-            accountNameDisplay: formatAccountName(
-              `@${loggedInAccount.username}`,
-              false
-            ),
-            accountPicSrc: loggedInAccount.profile_picture_url || ""
-          };
-        case "apple_oauth" /* apple_oauth */:
-          return {
-            userId: loggedInAccount.email,
-            accountLabel: "Apple ID",
-            accountName: loggedInAccount.email,
-            accountNameDisplay: formatAccountName(loggedInAccount.email, true),
-            accountPicSrc: ""
-          };
-        default:
-          return PLACEHOLDER_FUNKIT_USER_INFO;
-      }
-    } else {
+  const web2UserInfo = useMemo35(() => {
+    var _a;
+    if (!loggedInUser || !(loggedInUser == null ? void 0 : loggedInUser.linked_accounts) || !((_a = loggedInUser == null ? void 0 : loggedInUser.linked_accounts) == null ? void 0 : _a.length)) {
       return PLACEHOLDER_FUNKIT_USER_INFO;
     }
+    const loggedInAccount = loggedInUser.linked_accounts.find(
+      (account) => (account == null ? void 0 : account.type) === loginMethod
+    );
+    if (!loggedInAccount)
+      return PLACEHOLDER_FUNKIT_USER_INFO;
+    const id = loggedInUser.id;
+    const type = loggedInAccount.type;
+    let name = "";
+    let nameTruncated = "";
+    let iconSrc = "";
+    let typeLabel = "";
+    switch (loggedInAccount.type) {
+      case "email" /* email */:
+        name = loggedInAccount.address;
+        nameTruncated = formatAccountName(loggedInAccount.address, true);
+        typeLabel = "Email";
+        break;
+      case "google_oauth" /* google_oauth */:
+        name = loggedInAccount.email;
+        nameTruncated = formatAccountName(loggedInAccount.email, true);
+        typeLabel = "Email";
+        break;
+      case "twitter_oauth" /* twitter_oauth */:
+        name = `@${loggedInAccount.username}`;
+        nameTruncated = formatAccountName(name, false);
+        typeLabel = "Twitter ID";
+        iconSrc = loggedInAccount.profile_picture_url || "";
+        break;
+      case "apple_oauth" /* apple_oauth */:
+        name = loggedInAccount.email;
+        nameTruncated = formatAccountName(loggedInAccount.email, true);
+        typeLabel = "Apple ID";
+        iconSrc = loggedInAccount.profile_picture_url || "";
+        break;
+      case "farcaster" /* farcaster */:
+        name = `@${loggedInAccount.username}`;
+        nameTruncated = formatAccountName(name, false);
+        typeLabel = "Farcaster ID";
+        iconSrc = loggedInAccount.profile_picture_url || "";
+        break;
+    }
+    return {
+      id,
+      name,
+      nameTruncated,
+      type,
+      typeLabel,
+      iconSrc
+    };
   }, [loggedInUser, loginMethod]);
   const contextValue = {
     isSendingOtpEmail,
@@ -15546,7 +15835,7 @@ var FunkitWeb2Provider = ({
     clearLoginError,
     handleFunkitWeb2Login,
     handleFunkitWeb2Logout,
-    web2AccountInfo: userAccountInfo
+    web2UserInfo
   };
   return /* @__PURE__ */ React143.createElement(FunkitWeb2Context.Provider, {
     value: contextValue
@@ -16082,7 +16371,7 @@ function AccountButton({
     )
   }, /* @__PURE__ */ React148.createElement(Avatar, {
     address: account.address,
-    imageUrl: account.ensAvatar || userInfo.accountPicSrc,
+    imageUrl: account.ensAvatar || userInfo.iconSrc,
     loading: account.hasPendingTransactions,
     size: 24
   })), /* @__PURE__ */ React148.createElement(Box, {
@@ -16095,7 +16384,7 @@ function AccountButton({
       (value) => value === "full" || value === "address" ? "block" : "none"
     ),
     style: { textWrap: "nowrap" }
-  }, userInfo.accountNameDisplay), /* @__PURE__ */ React148.createElement(DropdownIcon, null)))));
+  }, userInfo.nameTruncated), /* @__PURE__ */ React148.createElement(DropdownIcon, null)))));
 }
 function ConnectButton({
   accountStatus = defaultProps.accountStatus,
@@ -16995,7 +17284,7 @@ function setFunkitConnectVersion({ version }) {
   localStorage.setItem(storageKey6, version);
 }
 function getCurrentSdkVersion() {
-  return "1.2.6";
+  return "1.2.7";
 }
 function useFingerprint() {
   const fingerprint = useCallback33(() => {