rebased

Author: moeodeh3

packages/core/src/__clients__/core.ts

@@ -70,11 +70,8 @@ import {
   isSolanaProvider,
   getAuthenticatorAddresses,
   getCurveTypeFromProvider,
-<<<<<<< HEAD
   isValidPasskeyName,
-=======
   addressFromPublicKey,
->>>>>>> d12cdedf (start on improving auth callback)
 } from "@utils";
 import { createStorageManager } from "../__storage__/base";
 import { CrossPlatformApiKeyStamper } from "../__stampers__/api/base";

packages/react-wallet-kit/src/utils/utils.ts

@@ -1,4 +1,9 @@
-import { OAuthAuthResult, Session, TurnkeyError, TurnkeyErrorCodes } from "@turnkey/sdk-types";
+import {
+  OAuthAuthResult,
+  Session,
+  TurnkeyError,
+  TurnkeyErrorCodes,
+} from "@turnkey/sdk-types";
 import type { TurnkeyCallbacks } from "../types/base";
 import { useCallback, useRef, useState, useEffect } from "react";
 import { WalletInterfaceType, WalletProvider } from "@turnkey/core";