@getpara/react-sdk 2.0.0-alpha.25 → 2.0.0-alpha.26

package/dist/modal/ParaModal.js

@@ -48,12 +48,12 @@ const ParaModal = forwardRef((props, ref) => {
   const { setSelectedWallet, updateSelectedWallet } = useWalletState();
   const setAuthStepRoute = useModalStore((state) => state.setAuthStepRoute);
   const { signUpOrLogIn, isCreateGuestWalletsPending } = useAuthActions();
-  const { data: account } = useAccount();
+  const { data: account, status: statusAccount } = useAccount();
   const [isModalMounted, setIsModalMounted] = useState(false);
-  const [isInit, setIsInit] = useState(false);
   const externalWallets = useStore((state) => state.externalWallets);
   const providerProps = useStore((state) => state.providerProps);
   const setAccountLinkOptions = useModalStore((state) => state.setAccountLinkOptions);
+  const isInitialized = useRef(false);
   const _a = __spreadValues(__spreadValues({}, storedModalConfig), props), {
     isOpen: configIsOpen,
     theme,
@@ -133,7 +133,7 @@ const ParaModal = forwardRef((props, ref) => {
   }, [hasPreviousStep, currentStep]);
   const initModal = (shouldAutoLogin) => __async(void 0, null, function* () {
     var _a2;
-    const isAccount = yield para.isFullyLoggedIn(), isGuest = isAccount && para.isGuestMode || isCreateGuestWalletsPending;
+    const isAccount = account == null ? void 0 : account.isConnected, isGuest = isAccount && para.isGuestMode || isCreateGuestWalletsPending;
     switch (true) {
       case !!currentStepOverride:
         setStep(ModalStep[currentStepOverride.toUpperCase()]);
@@ -175,8 +175,17 @@ const ParaModal = forwardRef((props, ref) => {
         }
         break;
     }
-    setIsInit(true);
   });
+  useEffect(() => {
+    if (para && isOpen && statusAccount === "success" && !isInitialized.current) {
+      initModal(isOpen);
+      isInitialized.current = true;
+    }
+    if (para && !isOpen && isInitialized.current) {
+      initModal();
+      isInitialized.current = false;
+    }
+  }, [para, isOpen, account, statusAccount]);
   useEffect(() => {
     let _authLayout = authLayout;
     if (!(externalWallets == null ? void 0 : externalWallets.length) && hasExternalWallet(authLayout)) {
@@ -197,18 +206,6 @@ const ParaModal = forwardRef((props, ref) => {
   useEffect(() => {
     setOnModalStepChange(onModalStepChange);
   }, [onModalStepChange]);
-  useEffect(() => {
-    if (para) {
-      initModal();
-    } else {
-      console.error("A Para instance must be provided.");
-    }
-  }, []);
-  useEffect(() => {
-    if (isOpen && para) {
-      initModal(true);
-    }
-  }, [isOpen]);
   useEffect(() => {
     updateSelectedWallet();
   }, [para]);
@@ -236,10 +233,6 @@ const ParaModal = forwardRef((props, ref) => {
     } else if (RESET_TO_ACCOUNT_STEPS.includes(currentStep)) {
       setStep(ModalStep.LOGIN_DONE);
     }
-    if (para) {
-      yield initModal();
-    }
-    setIsInit(false);
   });
   if (!para) {
     console.error("A Para instance is required.");
@@ -275,7 +268,7 @@ const ParaModal = forwardRef((props, ref) => {
       className,
       "data-testid": "modal",
       $embeddedModal: !!embeddedModal,
-      children: isModalMounted && ((embeddedModal || bareModal) && isInit || !embeddedModal && !bareModal) && /* @__PURE__ */ jsx(
+      children: isModalMounted && ((embeddedModal || bareModal) && isInitialized.current || !embeddedModal && !bareModal) && /* @__PURE__ */ jsx(
         ModalContent,
         __spreadValues({
           oAuthMethods,

package/dist/modal/components/ModalContent/ModalContent.js

@@ -1,6 +1,5 @@
 "use client";
 import {
-  __async,
   __spreadProps,
   __spreadValues
 } from "../../../chunk-MMUBH76A.js";
@@ -63,12 +62,6 @@ const ModalContent = forwardRef(
       }
     }, [onRampTestMode]);
     useEffect(() => {
-      const init = () => __async(void 0, null, function* () {
-        if (!(yield para.isFullyLoggedIn())) {
-          yield disconnectExternalWallet();
-        }
-      });
-      init();
       return () => {
         var _a;
         window.clearTimeout((_a = refs.poll.current) == null ? void 0 : _a.timeout);

package/dist/modal/constants/constants.js

@@ -119,7 +119,7 @@ const BODY_MOTION_VARIANTS = {
 const BODY_TRANSITION = {
   duration: 0.2
 };
-const SDK_VERSION = "2.0.0-alpha.24";
+const SDK_VERSION = "2.0.0-alpha.25";
 export {
   BODY_MOTION_VARIANTS,
   BODY_TRANSITION,

package/dist/provider/actions/getAccount.d.ts

@@ -22,5 +22,5 @@ export type Account = ({
     isConnected: true;
     isGuestMode: false;
 } & AccountValue);
-export declare const getAccount: (para?: ParaWeb) => Promise<Account>;
+export declare const getAccount: (para?: ParaWeb, isConnected?: boolean) => Promise<Account>;
 export {};

package/dist/provider/actions/getAccount.js

@@ -4,16 +4,19 @@ import {
   __spreadProps,
   __spreadValues
 } from "../../chunk-MMUBH76A.js";
-const getAccount = (para) => __async(void 0, null, function* () {
-  if (!!para && para.isGuestMode) {
+const getAccount = (para, isConnected) => __async(void 0, null, function* () {
+  if (!para) {
+    return { isConnected: false };
+  }
+  if (para.isGuestMode) {
     return {
       isConnected: true,
       isGuestMode: true,
       wallets: para.availableWallets
     };
   }
-  const isConnected = !!para && (yield para == null ? void 0 : para.isFullyLoggedIn());
-  if (isConnected) {
+  const _isConnected = isConnected != null ? isConnected : yield para == null ? void 0 : para.isFullyLoggedIn();
+  if (_isConnected) {
     const authInfo = para.authInfo;
     const value = __spreadProps(__spreadValues({}, authInfo || {}), {
       userId: para.userId,

package/dist/provider/actions/getWallet.d.ts

@@ -2,4 +2,4 @@ import ParaWeb, { TWalletType } from '@getpara/web-sdk';
 export declare const getWallet: (para?: ParaWeb, selectedWallet?: {
     id?: string;
     type?: TWalletType;
-}) => Promise<Omit<import("@getpara/web-sdk").Wallet, "signer"> | null | undefined>;
+}, isConnected?: boolean) => Promise<Omit<import("@getpara/web-sdk").Wallet, "signer"> | null | undefined>;

package/dist/provider/actions/getWallet.js

@@ -2,9 +2,12 @@
 import {
   __async
 } from "../../chunk-MMUBH76A.js";
-const getWallet = (para, selectedWallet) => __async(void 0, null, function* () {
-  const isLoggedIn = yield para == null ? void 0 : para.isFullyLoggedIn();
-  if (!para || !isLoggedIn) {
+const getWallet = (para, selectedWallet, isConnected) => __async(void 0, null, function* () {
+  if (!para) {
+    return null;
+  }
+  const isLoggedIn = isConnected != null ? isConnected : yield para == null ? void 0 : para.isFullyLoggedIn();
+  if (!isLoggedIn) {
     return null;
   }
   return para.findWallet(selectedWallet == null ? void 0 : selectedWallet.id, selectedWallet == null ? void 0 : selectedWallet.type);

package/dist/provider/actions/utils.d.ts

@@ -1,4 +1,4 @@
 import ParaWeb, { CoreMethodName, CoreMethodParams, CoreMethodResponse, CoreMethods, InternalAction, InternalMethodName, InternalMethods } from '@getpara/web-sdk';
-export type CoreAction<method extends CoreMethodName & keyof CoreMethods> = (para?: ParaWeb, ...args: [CoreMethodParams<method>]) => Promise<Awaited<CoreMethodResponse<method>>>;
+export type CoreAction<method extends CoreMethodName & keyof CoreMethods> = (para?: ParaWeb, ...args: [CoreMethodParams<method>] | []) => Promise<Awaited<CoreMethodResponse<method>>>;
 export declare function generateCoreAction<const method extends CoreMethodName & keyof CoreMethods>(method: method): CoreAction<method>;
 export declare function generateInternalAction<const method extends InternalMethodName & keyof InternalMethods>(method: method): InternalAction<method>;

package/dist/provider/hooks/queries/core.d.ts

@@ -1,2 +1,4 @@
-export declare const useLinkedAccounts: () => import("../../types/utils.js").CoreMethodQueryHook<"getLinkedAccounts">;
-export declare const useAccountLinkInProgress: () => import("../../types/utils.js").CoreMethodQueryHook<"accountLinkInProgress">;
+export declare const useLinkedAccounts: (params?: {
+    withMetadata?: boolean;
+} | undefined) => import("../../types/utils.js").CoreMethodQueryHook<"getLinkedAccounts">;
+export declare const useAccountLinkInProgress: (params?: undefined) => import("../../types/utils.js").CoreMethodQueryHook<"accountLinkInProgress">;

package/dist/provider/hooks/queries/core.js

@@ -2,10 +2,13 @@
 import "../../../chunk-MMUBH76A.js";
 import * as actions from "../../actions/index.js";
 import { generateCoreQueryHook } from "./utils.js";
-const useLinkedAccounts = generateCoreQueryHook("getLinkedAccounts", actions.getLinkedAccounts);
+const useLinkedAccounts = generateCoreQueryHook("getLinkedAccounts", actions.getLinkedAccounts, {
+  defaultParams: { withMetadata: false }
+});
 const useAccountLinkInProgress = generateCoreQueryHook(
   "accountLinkInProgress",
-  actions.accountLinkInProgress
+  actions.accountLinkInProgress,
+  { isGetter: true }
 );
 export {
   useAccountLinkInProgress,

package/dist/provider/hooks/queries/useAccount.d.ts

@@ -1,4 +1,5 @@
 export declare const ACCOUNT_BASE_KEY = "PARA_ACCOUNT";
+export declare const useIsFullyLoggedIn: () => import("@tanstack/react-query").UseQueryResult<boolean, Error>;
 /**
  * Hook for retrieving a user account
  */

package/dist/provider/hooks/queries/useAccount.js

@@ -6,16 +6,30 @@ import { useQuery } from "@tanstack/react-query";
 import { getAccount } from "../../actions/getAccount.js";
 import { useInternalClient } from "../utils/useInternalClient.js";
 const ACCOUNT_BASE_KEY = "PARA_ACCOUNT";
+const useIsFullyLoggedIn = () => {
+  const client = useInternalClient();
+  return useQuery({
+    staleTime: 5e3,
+    queryKey: ["isFullyLoggedIn", client == null ? void 0 : client.getUserId()],
+    queryFn: () => __async(void 0, null, function* () {
+      return yield client == null ? void 0 : client.isFullyLoggedIn();
+    })
+  });
+};
 const useAccount = () => {
+  var _a, _b;
   const client = useInternalClient();
+  const { data: isFullyLoggedIn, isSuccess } = useIsFullyLoggedIn();
   return useQuery({
-    queryKey: [ACCOUNT_BASE_KEY, client == null ? void 0 : client.getUserId()],
+    enabled: isSuccess && !!client,
+    queryKey: [ACCOUNT_BASE_KEY, isFullyLoggedIn != null ? isFullyLoggedIn : null, (_a = client == null ? void 0 : client.userId) != null ? _a : null, (_b = client == null ? void 0 : client.isGuestMode) != null ? _b : null],
     queryFn: () => __async(void 0, null, function* () {
-      return yield getAccount(client);
+      return yield getAccount(client, isFullyLoggedIn);
     })
   });
 };
 export {
   ACCOUNT_BASE_KEY,
-  useAccount
+  useAccount,
+  useIsFullyLoggedIn
 };

package/dist/provider/hooks/queries/useWallet.js

@@ -4,15 +4,18 @@ import {
 } from "../../../chunk-MMUBH76A.js";
 import { useQuery } from "@tanstack/react-query";
 import { useClient, useWalletState } from "../index.js";
+import { useIsFullyLoggedIn } from "./useAccount.js";
 import { getWallet } from "../../actions/getWallet.js";
 const WALLET_BASE_KEY = "PARA_WALLET";
 const useWallet = () => {
   const client = useClient();
   const { selectedWallet } = useWalletState();
+  const { data: isFullyLoggedIn, isSuccess } = useIsFullyLoggedIn();
   return useQuery({
-    queryKey: [WALLET_BASE_KEY, client == null ? void 0 : client.getUserId(), selectedWallet.id, selectedWallet.type],
+    enabled: !!client && !!selectedWallet && isSuccess,
+    queryKey: [WALLET_BASE_KEY, isFullyLoggedIn, selectedWallet.id, selectedWallet.type],
     queryFn: () => __async(void 0, null, function* () {
-      return yield getWallet(client, selectedWallet);
+      return yield getWallet(client, selectedWallet, isFullyLoggedIn);
     })
   });
 };

package/dist/provider/hooks/queries/utils.d.ts

@@ -1,4 +1,7 @@
-import ParaWeb, { CoreMethodName, CoreMethods } from '@getpara/web-sdk';
+import { CoreMethodName, CoreMethodParams, CoreMethods } from '@getpara/web-sdk';
 import { CoreMethodQueryHook } from '../../types/utils.js';
 import { CoreAction } from '../../actions/utils.js';
-export declare function generateCoreQueryHook<const method extends CoreMethodName & keyof CoreMethods>(method: method, action: CoreAction<method> & ((_: ParaWeb) => Promise<unknown>)): () => CoreMethodQueryHook<method>;
+export declare function generateCoreQueryHook<const method extends CoreMethodName & keyof CoreMethods>(method: method, action: CoreAction<method>, { isGetter, defaultParams }?: {
+    isGetter?: boolean;
+    defaultParams?: CoreMethodParams<method>;
+}): (params?: CoreMethodParams<method>) => CoreMethodQueryHook<method>;

package/dist/provider/hooks/queries/utils.js

@@ -4,16 +4,17 @@ import {
 } from "../../../chunk-MMUBH76A.js";
 import { useClient } from "../utils/index.js";
 import { useQuery } from "@tanstack/react-query";
-function generateCoreQueryHook(method, action) {
-  return () => {
+function generateCoreQueryHook(method, action, { isGetter = false, defaultParams } = {}) {
+  return (params = defaultParams) => {
+    var _a;
     const para = useClient();
     return useQuery({
-      queryKey: [method],
-      queryFn: () => __async(this, null, function* () {
+      queryKey: [method, params != null ? params : null, isGetter ? (_a = para == null ? void 0 : para[method]) != null ? _a : null : null],
+      queryFn: (_0) => __async(this, [_0], function* ({ queryKey: [_, params2] }) {
         if (!para) {
           return null;
         }
-        const result = yield action(para);
+        const result = params2 ? yield action(para, params2) : defaultParams ? yield action(para, defaultParams) : yield action(para);
         return result != null ? result : null;
       })
     });

package/dist/provider/providers/AccountLinkProvider.js

@@ -112,7 +112,7 @@ const AccountLinkProvider = ({ children }) => {
   } = useVerifyExternalWalletLink();
   const isEnabled = !!(account == null ? void 0 : account.isConnected) && !(account == null ? void 0 : account.isGuestMode) && (!(account == null ? void 0 : account.externalWallet) || includeWalletVerification);
   const [accountLinkInProgress, setAccountLinkInProgress] = useState(
-    coreAccountLinkInProgress
+    coreAccountLinkInProgress || void 0
   );
   const [unlinkingAccount, setUnlinkingAccount] = useState(void 0);
   const [linkAccountError, setLinkAccountError] = useState(null);
@@ -347,7 +347,7 @@ const AccountLinkProvider = ({ children }) => {
   };
   useEffect(() => {
     setAccountLinkInProgress((prev) => {
-      return coreAccountLinkInProgress != null ? coreAccountLinkInProgress : prev;
+      return coreAccountLinkInProgress || prev;
     });
   }, [coreAccountLinkInProgress]);
   useEffect(() => {

package/dist/provider/providers/AuthProvider.js

@@ -34,6 +34,7 @@ import { isExternalWallet } from "@getpara/user-management-client";
 import { routeMobileExternalWallet } from "../../modal/utils/routeMobileExternalWallet.js";
 import { useStore } from "../stores/useStore.js";
 import { useFormattedBiometricHints } from "../hooks/utils/useFormattedBiometricHints.js";
+import { useQueryClient } from "@tanstack/react-query";
 const AuthContext = createContext({
   signUpOrLogIn: () => {
   },
@@ -68,6 +69,7 @@ function AuthProvider({
   isRecoverySecretStepEnabled = false,
   overrides = {}
 }) {
+  const queryClient = useQueryClient();
   const para = useInternalClient();
   const userAgent = useUserAgent();
   const onLoginRef = useStore((state) => state.onLoginRef);
@@ -375,6 +377,7 @@ function AuthProvider({
       on2faNotSetup
     } = {}) {
       var _a;
+      yield queryClient.invalidateQueries({ queryKey: ["isFullyLoggedIn"] });
       setAuthState();
       yield (_a = onLoginRef.current) == null ? void 0 : _a.call(onLoginRef);
       if (is2faEnabled) {

package/dist/provider/types/utils.d.ts

@@ -24,7 +24,7 @@ export type CoreMethodQuery<method extends CoreMethodName & keyof CoreMethods> =
 export type CoreGetterQuery<name extends keyof typeof ParaWeb> = Query<(typeof ParaWeb)[name] | null, Error>;
 export type CoreMethodMutationState<method extends CoreMethodName & keyof CoreMethods> = MutationState<Awaited<CoreMethodResponse<method>>, Error, CoreMethodParams<method> | void, unknown>;
 export type CoreMethodMutationHook<method extends CoreMethodName & keyof CoreMethods> = Compute<CoreMethodUseMutationReturnType<method> & CoreSyncMutationHook<method> & CoreAsyncMutationHook<method>>;
-export type CoreMethodQueryHook<method extends CoreMethodName & keyof CoreMethods> = UseQueryResult<Awaited<CoreMethodResponse<method>>, Error>;
+export type CoreMethodQueryHook<method extends CoreMethodName & keyof CoreMethods> = UseQueryResult<Awaited<CoreMethodResponse<method>> | null, Error>;
 export type CoreGetterQueryHook<name extends keyof typeof ParaWeb> = UseQueryResult<(typeof ParaWeb)[name] | null, Error>;
 export type CoreMethodMutationStateHook<method extends CoreMethodName & keyof CoreMethods> = () => Omit<CoreMethodUseMutationReturnType<method>, 'reset'>;
 type InternalSyncMutationHook<method extends InternalMethodName & keyof InternalMethods> = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/react-sdk",
-  "version": "2.0.0-alpha.25",
+  "version": "2.0.0-alpha.26",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -15,9 +15,9 @@
     "*.css"
   ],
   "dependencies": {
-    "@getpara/react-common": "2.0.0-alpha.25",
-    "@getpara/react-components": "2.0.0-alpha.25",
-    "@getpara/web-sdk": "2.0.0-alpha.25",
+    "@getpara/react-common": "2.0.0-alpha.26",
+    "@getpara/react-components": "2.0.0-alpha.26",
+    "@getpara/web-sdk": "2.0.0-alpha.26",
     "date-fns": "^3.6.0",
     "framer-motion": "11.3.28",
     "libphonenumber-js": "^1.11.1",
@@ -33,9 +33,9 @@
     "cli": "node ./dist/cli/cli.mjs"
   },
   "devDependencies": {
-    "@getpara/cosmos-wallet-connectors": "2.0.0-alpha.25",
-    "@getpara/evm-wallet-connectors": "2.0.0-alpha.25",
-    "@getpara/solana-wallet-connectors": "2.0.0-alpha.25",
+    "@getpara/cosmos-wallet-connectors": "2.0.0-alpha.26",
+    "@getpara/evm-wallet-connectors": "2.0.0-alpha.26",
+    "@getpara/solana-wallet-connectors": "2.0.0-alpha.26",
     "@testing-library/dom": "^10.4.0",
     "@testing-library/react": "^16.3.0",
     "@testing-library/react-hooks": "^8.0.1",
@@ -63,5 +63,5 @@
   "resolutions": {
     "styled-components": "^6"
   },
-  "gitHead": "51f576cb7d3f0d55fdd5508f7445b2c7b48d0696"
+  "gitHead": "c97be88dd7414041f25d6f4b9758ea26dcfb2694"
 }