@mezo-org/passport 0.4.0-dev.76 → 0.4.0-dev.78

package/dist/src/hooks/index.d.ts

@@ -1,4 +1,5 @@
 export { useBitcoinAccount, useSendBitcoin, useSendTransaction, useSubscribeToConnectedToUnsupportedBitcoinAddress, useSubscribeToConnectorEvent, useSubscribeToWalletNetworkDoesNotMatchProviderChain, } from "@mezo-org/orangekit";
+export * from "./useAddMezoChainToWallet";
 export { useInvalidateBorrowData, useResetBorrowData } from "./useBorrowData";
 export * from "./useGetAccountByAddress";
 export * from "./useGetAccountByMezoId";

package/dist/src/hooks/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA"}

package/dist/src/hooks/index.js

@@ -1,4 +1,5 @@
 export { useBitcoinAccount, useSendBitcoin, useSendTransaction, useSubscribeToConnectedToUnsupportedBitcoinAddress, useSubscribeToConnectorEvent, useSubscribeToWalletNetworkDoesNotMatchProviderChain, } from "@mezo-org/orangekit";
+export * from "./useAddMezoChainToWallet";
 export { useInvalidateBorrowData, useResetBorrowData } from "./useBorrowData";
 export * from "./useGetAccountByAddress";
 export * from "./useGetAccountByMezoId";

package/dist/src/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,cAAc,EACd,kBAAkB,EAClB,kDAAkD,EAClD,4BAA4B,EAC5B,oDAAoD,GACrD,MAAM,qBAAqB,CAAA;AAC5B,cAAc,2BAA2B,CAAA;AACzC,OAAO,EAAE,uBAAuB,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAA;AAC7E,cAAc,0BAA0B,CAAA;AACxC,cAAc,yBAAyB,CAAA;AACvC,cAAc,wBAAwB,CAAA;AACtC,cAAc,iBAAiB,CAAA;AAC/B,cAAc,kBAAkB,CAAA;AAChC,cAAc,sBAAsB,CAAA;AACpC,cAAc,wBAAwB,CAAA;AACtC,cAAc,uBAAuB,CAAA;AACrC,cAAc,cAAc,CAAA;AAC5B,cAAc,uBAAuB,CAAA;AACrC,OAAO,EACL,2BAA2B,EAC3B,sBAAsB,GACvB,MAAM,qBAAqB,CAAA;AAC5B,cAAc,mBAAmB,CAAA;AACjC,cAAc,qBAAqB,CAAA"}

package/dist/src/hooks/useAddMezoChainToWallet.d.ts

@@ -0,0 +1,5 @@
+export declare const useAddMezoChainToWallet: (mezoNetwork: "mainnet" | "testnet", onMezoChainAdded?: (chainId: number) => void | Promise<void>) => {
+    isMezoChain: boolean;
+    addMezoChain: () => Promise<void>;
+};
+//# sourceMappingURL=useAddMezoChainToWallet.d.ts.map

package/dist/src/hooks/useAddMezoChainToWallet.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAddMezoChainToWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAddMezoChainToWallet.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,uBAAuB,GAClC,aAAa,SAAS,GAAG,SAAS,EAClC,mBAAmB,CAAC,OAAO,EAAE,MAAM,KAAK,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;;;CA2D7D,CAAA"}

package/dist/src/hooks/useAddMezoChainToWallet.js

@@ -0,0 +1,55 @@
+import { mezoMainnet, mezoTestnet } from "@mezo-org/orangekit";
+import { useCallback, useEffect, useState } from "react";
+import { useAccount } from "wagmi";
+export const useAddMezoChainToWallet = (mezoNetwork, onMezoChainAdded) => {
+    const [isMezoChain, setIsMezoChain] = useState(false);
+    const MEZO_CHAIN = mezoNetwork === "mainnet" ? mezoMainnet : mezoTestnet;
+    const hexadecimalMezoChainId = `0x${MEZO_CHAIN.id.toString(16)}`;
+    const { connector } = useAccount();
+    useEffect(() => {
+        const getCurrentChainId = async () => {
+            if (!window.ethereum || connector?.type === "orangekit")
+                return;
+            const currentChainId = await window.ethereum.request({
+                method: "eth_chainId",
+            });
+            setIsMezoChain(currentChainId === hexadecimalMezoChainId);
+        };
+        getCurrentChainId();
+    }, [connector, hexadecimalMezoChainId]);
+    const addMezoChain = useCallback(async () => {
+        if (!window.ethereum || connector?.type === "orangekit")
+            return;
+        const mezoChainParams = {
+            chainId: hexadecimalMezoChainId,
+            chainName: MEZO_CHAIN.name,
+            nativeCurrency: MEZO_CHAIN.nativeCurrency,
+            rpcUrls: [MEZO_CHAIN.rpcUrls.default.http[0]],
+            blockExplorerUrls: [MEZO_CHAIN.blockExplorers?.default.url],
+        };
+        try {
+            await window.ethereum.request({
+                method: "wallet_addEthereumChain",
+                params: [mezoChainParams],
+            });
+            setIsMezoChain(true);
+            if (onMezoChainAdded)
+                onMezoChainAdded(MEZO_CHAIN.id);
+            // setConnectedChainId(MEZO_CHAIN.id)
+        }
+        catch (err) {
+            setIsMezoChain(false);
+        }
+    }, [
+        connector?.type,
+        hexadecimalMezoChainId,
+        MEZO_CHAIN.name,
+        MEZO_CHAIN.nativeCurrency,
+        MEZO_CHAIN.rpcUrls.default.http,
+        MEZO_CHAIN.blockExplorers?.default.url,
+        MEZO_CHAIN.id,
+        onMezoChainAdded,
+    ]);
+    return { isMezoChain, addMezoChain };
+};
+//# sourceMappingURL=useAddMezoChainToWallet.js.map

package/dist/src/hooks/useAddMezoChainToWallet.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useAddMezoChainToWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAddMezoChainToWallet.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,OAAO,CAAA;AAElC,MAAM,CAAC,MAAM,uBAAuB,GAAG,CACrC,WAAkC,EAClC,gBAA4D,EAC5D,EAAE;IACF,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAA;IAErD,MAAM,UAAU,GAAG,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,CAAA;IAExE,MAAM,sBAAsB,GAAG,KAAK,UAAU,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE,CAAA;IAEhE,MAAM,EAAE,SAAS,EAAE,GAAG,UAAU,EAAE,CAAA;IAElC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,iBAAiB,GAAG,KAAK,IAAI,EAAE;YACnC,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE,IAAI,KAAK,WAAW;gBAAE,OAAM;YAE/D,MAAM,cAAc,GAAG,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;gBACnD,MAAM,EAAE,aAAa;aACtB,CAAC,CAAA;YAEF,cAAc,CAAC,cAAc,KAAK,sBAAsB,CAAC,CAAA;QAC3D,CAAC,CAAA;QAED,iBAAiB,EAAE,CAAA;IACrB,CAAC,EAAE,CAAC,SAAS,EAAE,sBAAsB,CAAC,CAAC,CAAA;IAEvC,MAAM,YAAY,GAAG,WAAW,CAAC,KAAK,IAAI,EAAE;QAC1C,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,SAAS,EAAE,IAAI,KAAK,WAAW;YAAE,OAAM;QAE/D,MAAM,eAAe,GAAG;YACtB,OAAO,EAAE,sBAAsB;YAC/B,SAAS,EAAE,UAAU,CAAC,IAAI;YAC1B,cAAc,EAAE,UAAU,CAAC,cAAc;YACzC,OAAO,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC7C,iBAAiB,EAAE,CAAC,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG,CAAC;SAC5D,CAAA;QAED,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;gBAC5B,MAAM,EAAE,yBAAyB;gBACjC,MAAM,EAAE,CAAC,eAAe,CAAC;aAC1B,CAAC,CAAA;YAEF,cAAc,CAAC,IAAI,CAAC,CAAA;YACpB,IAAI,gBAAgB;gBAAE,gBAAgB,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YACrD,qCAAqC;QACvC,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,cAAc,CAAC,KAAK,CAAC,CAAA;QACvB,CAAC;IACH,CAAC,EAAE;QACD,SAAS,EAAE,IAAI;QACf,sBAAsB;QACtB,UAAU,CAAC,IAAI;QACf,UAAU,CAAC,cAAc;QACzB,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI;QAC/B,UAAU,CAAC,cAAc,EAAE,OAAO,CAAC,GAAG;QACtC,UAAU,CAAC,EAAE;QACb,gBAAgB;KACjB,CAAC,CAAA;IAEF,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,CAAA;AACtC,CAAC,CAAA"}

package/dist/src/hooks/useAuthenticateWithWallet.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthenticateWithWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAA;AASpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAGrC,iBAAS,yBAAyB,CAChC,mBAAmB,UAAQ,EAC3B,eAAe,GAAE,IAAI,CACnB,eAAe,CAAC,OAAO,CAAC,EACxB,YAAY,GAAG,aAAa,CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA0FP;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAA"}
+{"version":3,"file":"useAuthenticateWithWallet.d.ts","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAe,MAAM,uBAAuB,CAAA;AAUpE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,QAAQ,CAAA;AAKrC,iBAAS,yBAAyB,CAChC,mBAAmB,UAAQ,EAC3B,eAAe,GAAE,IAAI,CACnB,eAAe,CAAC,OAAO,CAAC,EACxB,YAAY,GAAG,aAAa,CACxB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyGP;AAED,OAAO,EAAE,yBAAyB,EAAE,CAAA"}

package/dist/src/hooks/useAuthenticateWithWallet.js

@@ -1,17 +1,24 @@
-import { useSignMessage } from "wagmi";
+import { useSignMessage, useSwitchChain } from "wagmi";
 import { useMutation } from "@tanstack/react-query";
+import { mezoMainnet, mezoTestnet } from "@mezo-org/orangekit";
 import { useCreateAccount } from "./useCreateAccount";
 import { useCreateSession } from "./useCreateSession";
 import { useEnsureNoSessionAndFetchNonce } from "./useEnsureNoSessionAndFetchNonce";
 import { createSignInWithWalletMessage, verifyDomainInSignInWithWalletMessage, } from "../utils/siww";
 import { useGetAccountByAddress } from "./useGetAccountByAddress";
 import useWalletAccount from "./useWalletAccount";
+import { useAddMezoChainToWallet } from "./useAddMezoChainToWallet";
+import { usePassportContext } from "./usePassportContext";
 function useAuthenticateWithWallet(shouldCreateAccount = false, mutationOptions = {}) {
-    const { walletAddress, chainId, connector, networkFamily } = useWalletAccount();
+    const { walletAddress, chainId: walletChainId, connector, networkFamily, } = useWalletAccount();
     const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce();
     const { createSessionAsync } = useCreateSession();
     const { createAccountAsync } = useCreateAccount();
     const { signMessageAsync } = useSignMessage();
+    const { environment } = usePassportContext();
+    const { isMezoChain, addMezoChain } = useAddMezoChainToWallet(environment);
+    const MEZO_CHAIN = environment === "mainnet" ? mezoMainnet : mezoTestnet;
+    const { switchChainAsync } = useSwitchChain();
     const { refetch: getAccountByAddress } = useGetAccountByAddress(walletAddress, {
         enabled: false,
         retry: false,
@@ -21,6 +28,12 @@ function useAuthenticateWithWallet(shouldCreateAccount = false, mutationOptions
             if (!walletAddress) {
                 throw new Error("Sign in error: Wallet not connected!");
             }
+            let chainId = walletChainId;
+            if (connector?.type !== "orangekit" && !isMezoChain) {
+                await addMezoChain();
+                const newChain = await switchChainAsync({ chainId: MEZO_CHAIN.id });
+                chainId = newChain.id;
+            }
             const nonce = await ensureNoSessionAndFetchNonce();
             const messageResult = createSignInWithWalletMessage(walletAddress, nonce, networkFamily, chainId);
             const signatureResult = await signMessageAsync({

package/dist/src/hooks/useAuthenticateWithWallet.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthenticateWithWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"useAuthenticateWithWallet.js","sourceRoot":"","sources":["../../../src/hooks/useAuthenticateWithWallet.ts"],"names":[],"mappings":"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"}

package/dist/src/provider.d.ts

@@ -2,13 +2,13 @@ import { AuthApiClient, PortalApiClient } from "./api";
 export interface PassportContextValue {
     authApiClient: AuthApiClient;
     portalApiClient: PortalApiClient;
-    environment?: Environment;
+    environment: Environment;
 }
 export declare const PassportContext: import("react").Context<PassportContextValue | undefined>;
 type Environment = "mainnet" | "testnet";
 type PassportProviderProps = {
     children: React.ReactNode;
-    environment?: Environment;
+    environment: Environment;
     authApiUrl?: string;
     portalApiUrl?: string;
 };

package/dist/src/provider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAEtD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,aAAa,CAAA;IAC5B,eAAe,EAAE,eAAe,CAAA;IAChC,WAAW,CAAC,EAAE,WAAW,CAAA;CAC1B;AAED,eAAO,MAAM,eAAe,2DAE3B,CAAA;AAED,KAAK,WAAW,GAAG,SAAS,GAAG,SAAS,CAAA;AAExC,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAEzB,WAAW,CAAC,EAAE,WAAW,CAAA;IAEzB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,GACT,EAAE,qBAAqB,6GAmBvB"}
+{"version":3,"file":"provider.d.ts","sourceRoot":"","sources":["../../src/provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAEtD,MAAM,WAAW,oBAAoB;IACnC,aAAa,EAAE,aAAa,CAAA;IAC5B,eAAe,EAAE,eAAe,CAAA;IAChC,WAAW,EAAE,WAAW,CAAA;CACzB;AAED,eAAO,MAAM,eAAe,2DAE3B,CAAA;AAED,KAAK,WAAW,GAAG,SAAS,GAAG,SAAS,CAAA;AAExC,KAAK,qBAAqB,GAAG;IAC3B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IAEzB,WAAW,EAAE,WAAW,CAAA;IAExB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,wBAAgB,gBAAgB,CAAC,EAC/B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,GACT,EAAE,qBAAqB,6GAmBvB"}

package/dist/src/provider.js

@@ -2,7 +2,7 @@ import { createContext, createElement } from "react";
 import { AuthApiClient, PortalApiClient } from "./api";
 export const PassportContext = createContext(undefined);
 export function PassportProvider({ environment, authApiUrl, portalApiUrl, children, }) {
-    if (environment && !["mainnet", "testnet"].includes(environment)) {
+    if (!environment || !["mainnet", "testnet"].includes(environment)) {
         throw new Error("Wrong environment passed to PassportProvider.");
     }
     return createElement(PassportContext.Provider, {

package/dist/src/provider.js.map

@@ -1 +1 @@
-{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAQtD,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAC1C,SAAS,CACV,CAAA;AAcD,MAAM,UAAU,gBAAgB,CAAC,EAC/B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,GACc;IACtB,IAAI,WAAW,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACjE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;IAClE,CAAC;IAED,OAAO,aAAa,CAClB,eAAe,CAAC,QAAQ,EACxB;QACE,KAAK,EAAE;YACL,aAAa,EAAE,IAAI,aAAa,CAAC,WAAW,IAAI,SAAS,EAAE,UAAU,CAAC;YACtE,eAAe,EAAE,IAAI,eAAe,CAClC,WAAW,IAAI,SAAS,EACxB,YAAY,CACb;YACD,WAAW;SACZ;KACF,EACD,QAAQ,CACT,CAAA;AACH,CAAC"}
+{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../src/provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,OAAO,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,OAAO,CAAA;AAQtD,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAC1C,SAAS,CACV,CAAA;AAcD,MAAM,UAAU,gBAAgB,CAAC,EAC/B,WAAW,EACX,UAAU,EACV,YAAY,EACZ,QAAQ,GACc;IACtB,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QAClE,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;IAClE,CAAC;IAED,OAAO,aAAa,CAClB,eAAe,CAAC,QAAQ,EACxB;QACE,KAAK,EAAE;YACL,aAAa,EAAE,IAAI,aAAa,CAAC,WAAW,IAAI,SAAS,EAAE,UAAU,CAAC;YACtE,eAAe,EAAE,IAAI,eAAe,CAClC,WAAW,IAAI,SAAS,EACxB,YAAY,CACb;YACD,WAAW;SACZ;KACF,EACD,QAAQ,CACT,CAAA;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mezo-org/passport",
-  "version": "0.4.0-dev.76",
+  "version": "0.4.0-dev.78",
   "main": "dist/src/index.js",
   "license": "GPL-3.0-only",
   "scripts": {
@@ -37,7 +37,7 @@
     "typescript": "^5.4.3"
   },
   "dependencies": {
-    "@mezo-org/mezo-clay": "0.1.0-dev.30",
+    "@mezo-org/mezo-clay": "0.1.0-dev.28",
     "@mezo-org/mezod-contracts": "^1.0.0",
     "@mezo-org/musd-contracts": "^1.0.1",
     "@mezo-org/orangekit": "1.0.0-beta.40-dev.19",

package/src/hooks/index.ts

@@ -6,6 +6,7 @@ export {
   useSubscribeToConnectorEvent,
   useSubscribeToWalletNetworkDoesNotMatchProviderChain,
 } from "@mezo-org/orangekit"
+export * from "./useAddMezoChainToWallet"
 export { useInvalidateBorrowData, useResetBorrowData } from "./useBorrowData"
 export * from "./useGetAccountByAddress"
 export * from "./useGetAccountByMezoId"

package/src/hooks/useAddMezoChainToWallet.ts

@@ -0,0 +1,66 @@
+import { mezoMainnet, mezoTestnet } from "@mezo-org/orangekit"
+import { useCallback, useEffect, useState } from "react"
+import { useAccount } from "wagmi"
+
+export const useAddMezoChainToWallet = (
+  mezoNetwork: "mainnet" | "testnet",
+  onMezoChainAdded?: (chainId: number) => void | Promise<void>,
+) => {
+  const [isMezoChain, setIsMezoChain] = useState(false)
+
+  const MEZO_CHAIN = mezoNetwork === "mainnet" ? mezoMainnet : mezoTestnet
+
+  const hexadecimalMezoChainId = `0x${MEZO_CHAIN.id.toString(16)}`
+
+  const { connector } = useAccount()
+
+  useEffect(() => {
+    const getCurrentChainId = async () => {
+      if (!window.ethereum || connector?.type === "orangekit") return
+
+      const currentChainId = await window.ethereum.request({
+        method: "eth_chainId",
+      })
+
+      setIsMezoChain(currentChainId === hexadecimalMezoChainId)
+    }
+
+    getCurrentChainId()
+  }, [connector, hexadecimalMezoChainId])
+
+  const addMezoChain = useCallback(async () => {
+    if (!window.ethereum || connector?.type === "orangekit") return
+
+    const mezoChainParams = {
+      chainId: hexadecimalMezoChainId,
+      chainName: MEZO_CHAIN.name,
+      nativeCurrency: MEZO_CHAIN.nativeCurrency,
+      rpcUrls: [MEZO_CHAIN.rpcUrls.default.http[0]],
+      blockExplorerUrls: [MEZO_CHAIN.blockExplorers?.default.url],
+    }
+
+    try {
+      await window.ethereum.request({
+        method: "wallet_addEthereumChain",
+        params: [mezoChainParams],
+      })
+
+      setIsMezoChain(true)
+      if (onMezoChainAdded) onMezoChainAdded(MEZO_CHAIN.id)
+      // setConnectedChainId(MEZO_CHAIN.id)
+    } catch (err) {
+      setIsMezoChain(false)
+    }
+  }, [
+    connector?.type,
+    hexadecimalMezoChainId,
+    MEZO_CHAIN.name,
+    MEZO_CHAIN.nativeCurrency,
+    MEZO_CHAIN.rpcUrls.default.http,
+    MEZO_CHAIN.blockExplorers?.default.url,
+    MEZO_CHAIN.id,
+    onMezoChainAdded,
+  ])
+
+  return { isMezoChain, addMezoChain }
+}

package/src/hooks/useAuthenticateWithWallet.ts

@@ -1,5 +1,6 @@
-import { useSignMessage } from "wagmi"
+import { useSignMessage, useSwitchChain } from "wagmi"
 import { MutationOptions, useMutation } from "@tanstack/react-query"
+import { mezoMainnet, mezoTestnet } from "@mezo-org/orangekit"
 import { useCreateAccount } from "./useCreateAccount"
 import { useCreateSession } from "./useCreateSession"
 import { useEnsureNoSessionAndFetchNonce } from "./useEnsureNoSessionAndFetchNonce"
@@ -10,6 +11,8 @@ import {
 import { useGetAccountByAddress } from "./useGetAccountByAddress"
 import type { Session } from "../api"
 import useWalletAccount from "./useWalletAccount"
+import { useAddMezoChainToWallet } from "./useAddMezoChainToWallet"
+import { usePassportContext } from "./usePassportContext"
 
 function useAuthenticateWithWallet(
   shouldCreateAccount = false,
@@ -18,12 +21,20 @@ function useAuthenticateWithWallet(
     "mutationFn" | "mutationKey"
   > = {},
 ) {
-  const { walletAddress, chainId, connector, networkFamily } =
-    useWalletAccount()
+  const {
+    walletAddress,
+    chainId: walletChainId,
+    connector,
+    networkFamily,
+  } = useWalletAccount()
   const { ensureNoSessionAndFetchNonce } = useEnsureNoSessionAndFetchNonce()
   const { createSessionAsync } = useCreateSession()
   const { createAccountAsync } = useCreateAccount()
   const { signMessageAsync } = useSignMessage()
+  const { environment } = usePassportContext()
+  const { isMezoChain, addMezoChain } = useAddMezoChainToWallet(environment)
+  const MEZO_CHAIN = environment === "mainnet" ? mezoMainnet : mezoTestnet
+  const { switchChainAsync } = useSwitchChain()
 
   const { refetch: getAccountByAddress } = useGetAccountByAddress(
     walletAddress,
@@ -39,6 +50,13 @@ function useAuthenticateWithWallet(
         throw new Error("Sign in error: Wallet not connected!")
       }
 
+      let chainId = walletChainId
+      if (connector?.type !== "orangekit" && !isMezoChain) {
+        await addMezoChain()
+        const newChain = await switchChainAsync({ chainId: MEZO_CHAIN.id })
+        chainId = newChain.id
+      }
+
       const nonce = await ensureNoSessionAndFetchNonce()
 
       const messageResult = createSignInWithWalletMessage(

package/src/provider.ts

@@ -4,7 +4,7 @@ import { AuthApiClient, PortalApiClient } from "./api"
 export interface PassportContextValue {
   authApiClient: AuthApiClient
   portalApiClient: PortalApiClient
-  environment?: Environment
+  environment: Environment
 }
 
 export const PassportContext = createContext<PassportContextValue | undefined>(
@@ -16,7 +16,7 @@ type Environment = "mainnet" | "testnet"
 type PassportProviderProps = {
   children: React.ReactNode
   // eslint-disable-next-line react/require-default-props
-  environment?: Environment
+  environment: Environment
   // eslint-disable-next-line react/require-default-props
   authApiUrl?: string
   // eslint-disable-next-line react/require-default-props
@@ -29,7 +29,7 @@ export function PassportProvider({
   portalApiUrl,
   children,
 }: PassportProviderProps) {
-  if (environment && !["mainnet", "testnet"].includes(environment)) {
+  if (!environment || !["mainnet", "testnet"].includes(environment)) {
     throw new Error("Wrong environment passed to PassportProvider.")
   }