@openfort/react 1.0.9 → 1.0.10

package/build/components/Pages/Connected/EthereumConnected.js

@@ -40,9 +40,16 @@ const EthereumConnected = () => {
     const wallet = useEthereumEmbeddedWallet();
     const { embeddedAccounts } = useOpenfortCore();
     const hasEthereumWallets = ((_a = embeddedAccounts === null || embeddedAccounts === void 0 ? void 0 : embeddedAccounts.filter((a) => a.chainType === ChainTypeEnum.EVM)) !== null && _a !== void 0 ? _a : []).length > 0;
-    const isConnected = wallet.status === 'connected';
-    const address = isConnected ? wallet.address : undefined;
-    const chainId = isConnected ? wallet.chainId : undefined;
+    // Use embedded wallet if available, otherwise fall back to bridge (external wallet)
+    const embeddedConnected = wallet.status === 'connected';
+    const bridgeConnected = !!((bridge === null || bridge === void 0 ? void 0 : bridge.account.isConnected) && (bridge === null || bridge === void 0 ? void 0 : bridge.account.address));
+    const isConnected = embeddedConnected || bridgeConnected;
+    const address = embeddedConnected
+        ? wallet.address
+        : bridgeConnected
+            ? bridge.account.address
+            : undefined;
+    const chainId = embeddedConnected ? wallet.chainId : bridgeConnected ? bridge.chainId : undefined;
     const { chainType } = useOpenfortCore();
     useEffect(() => {
         if (process.env.NODE_ENV === 'development' && chainType !== ChainTypeEnum.EVM) {

package/build/components/Pages/Connected/EthereumConnected.js.map

@@ -1 +1 @@
-{"version":3,"file":"EthereumConnected.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"EthereumConnected.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/components/Pages/Loading/index.js

@@ -2,6 +2,7 @@ import { jsx } from 'react/jsx-runtime';
 import { ChainTypeEnum, EmbeddedState } from '@openfort/openfort-js';
 import React, { useEffect } from 'react';
 import { useEthereumEmbeddedWallet } from '../../../ethereum/hooks/useEthereumEmbeddedWallet.js';
+import { useEthereumBridge } from '../../../ethereum/OpenfortEthereumBridgeContext.js';
 import { useOpenfortCore } from '../../../openfort/useOpenfort.js';
 import { useSolanaEmbeddedWallet } from '../../../solana/hooks/useSolanaEmbeddedWallet.js';
 import Loader from '../../Common/Loading/index.js';
@@ -13,12 +14,15 @@ const Loading = () => {
     const { setRoute, walletConfig } = useOpenfort();
     const { user, isLoadingAccounts, isLoading, needsRecovery, embeddedState } = useOpenfortCore();
     const { chainType } = useOpenfortCore();
+    const bridge = useEthereumBridge();
     // Use chain-specific hooks
     const ethereumWallet = useEthereumEmbeddedWallet();
     const solanaWallet = useSolanaEmbeddedWallet();
     const wallet = chainType === ChainTypeEnum.EVM ? ethereumWallet : solanaWallet;
-    const isConnected = wallet.status === 'connected';
-    const address = isConnected ? wallet.address : undefined;
+    // Check embedded wallet or bridge (external wallet) connection
+    const embeddedConnected = wallet.status === 'connected';
+    const bridgeConnected = chainType === ChainTypeEnum.EVM && !!((bridge === null || bridge === void 0 ? void 0 : bridge.account.isConnected) && (bridge === null || bridge === void 0 ? void 0 : bridge.account.address));
+    const address = embeddedConnected ? wallet.address : bridgeConnected ? bridge === null || bridge === void 0 ? void 0 : bridge.account.address : undefined;
     const [isFirstFrame, setIsFirstFrame] = React.useState(true);
     const [retryCount, setRetryCount] = React.useState(0);
     useEffect(() => {
@@ -27,7 +31,8 @@ const Loading = () => {
         // Wait for the SDK to settle. After storeCredentials the embedded state
         // briefly stays UNAUTHENTICATED/NONE while the SDK processes the token.
         // Routing to PROVIDERS here would abort the auth flow.
-        if (embeddedState === EmbeddedState.NONE || embeddedState === EmbeddedState.UNAUTHENTICATED)
+        // However, if bridge (external wallet) is already connected, don't block routing.
+        if ((embeddedState === EmbeddedState.NONE || embeddedState === EmbeddedState.UNAUTHENTICATED) && !bridgeConnected)
             return;
         // Also wait while accounts or user are still loading.
         if (isLoadingAccounts || isLoading)

package/build/components/Pages/Loading/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/components/Pages/Receive/index.js

@@ -3,6 +3,7 @@ import { ChainTypeEnum } from '@openfort/openfort-js';
 import { useEffect } from 'react';
 import Logos from '../../../assets/logos.js';
 import { useEthereumEmbeddedWallet } from '../../../ethereum/hooks/useEthereumEmbeddedWallet.js';
+import { useEthereumBridge } from '../../../ethereum/OpenfortEthereumBridgeContext.js';
 import { useOpenfortCore } from '../../../openfort/useOpenfort.js';
 import { useSolanaEmbeddedWallet } from '../../../solana/hooks/useSolanaEmbeddedWallet.js';
 import { CopyIconButton } from '../../Common/CopyToClipboard/CopyIconButton.js';
@@ -27,10 +28,18 @@ const Receive = () => {
     const { chainType } = useOpenfortCore();
     const ethereumWallet = useEthereumEmbeddedWallet();
     const solanaWallet = useSolanaEmbeddedWallet();
+    const bridge = useEthereumBridge();
     const wallet = chainType === ChainTypeEnum.EVM ? ethereumWallet : solanaWallet;
-    const isConnected = wallet.status === 'connected';
-    const address = isConnected ? wallet.address : undefined;
-    const chainId = isConnected && chainType === ChainTypeEnum.EVM ? wallet.chainId : undefined;
+    // Use embedded wallet if available, otherwise fall back to bridge (external wallet)
+    const embeddedConnected = wallet.status === 'connected';
+    const bridgeConnected = chainType === ChainTypeEnum.EVM && !!((bridge === null || bridge === void 0 ? void 0 : bridge.account.isConnected) && (bridge === null || bridge === void 0 ? void 0 : bridge.account.address));
+    const isConnected = embeddedConnected || bridgeConnected;
+    const address = embeddedConnected ? wallet.address : bridgeConnected ? bridge === null || bridge === void 0 ? void 0 : bridge.account.address : undefined;
+    const chainId = embeddedConnected && chainType === ChainTypeEnum.EVM
+        ? wallet.chainId
+        : bridgeConnected
+            ? bridge === null || bridge === void 0 ? void 0 : bridge.chainId
+            : undefined;
     const chain = chains.find((c) => c.id === chainId);
     const qrValue = address || '';
     const networkLabel = isConnected && chainType === ChainTypeEnum.SVM && solanaWallet.cluster

package/build/components/Pages/Receive/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"index.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/version.d.ts

@@ -1 +1 @@
-export declare const OPENFORT_VERSION = "1.0.9";
+export declare const OPENFORT_VERSION = "1.0.10";

package/build/version.js

@@ -1,4 +1,4 @@
-const OPENFORT_VERSION = '1.0.9';
+const OPENFORT_VERSION = '1.0.10';
 
 export { OPENFORT_VERSION };
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openfort/react",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "author": "Openfort (https://www.openfort.io)",
   "license": "BSD-2-Clause license",
   "description": "The easiest way to integrate Openfort to your project.",