Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions packages/appkit/src/AppKit.ts
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ export class AppKit {
/**
* Returns the provider for a given namespace.
* @param namespace - The namespace to get the provider for.
* @returns The provider for the given namespace.
* @returns The provider for the given namespace, or null if not available or not yet initialized.
*/
getProvider<T extends Provider>(namespace?: string): T | null {
const activeNamespace = namespace ?? ConnectionsController.state.activeNamespace;
Expand All @@ -256,7 +256,15 @@ export class AppKit {
);
if (!connection || !connection.adapter || !connection.adapter.connector) return null;

return connection.adapter.connector.getProvider() as T;
try {
return connection.adapter.connector.getProvider() as T | null;
} catch (error) {
// Provider not initialized yet during session restoration
// This can happen on app restart when restoring a previous connection
LogController.sendError(error, 'AppKit.ts', 'getProvider');

return null;
}
}

getNetworks() {
Expand Down
21 changes: 15 additions & 6 deletions packages/appkit/src/hooks/useProvider.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable valtio/state-snapshot-rule */
import { useMemo } from 'react';
import { useSnapshot } from 'valtio';
import { ConnectionsController } from '@reown/appkit-core-react-native';
import { ConnectionsController, LogController } from '@reown/appkit-core-react-native';
import type { Provider, ChainNamespace } from '@reown/appkit-common-react-native';

/**
Expand Down Expand Up @@ -40,12 +40,21 @@ export function useProvider(): ProviderResult {
const { connection } = useSnapshot(ConnectionsController.state);

const returnValue = useMemo(() => {
if (!connection) return { provider: undefined, providerType: undefined };
if (!connection || !connection.adapter) {
return { provider: undefined, providerType: undefined };
}

return {
provider: connection.adapter.getProvider(),
providerType: connection.adapter.getSupportedNamespace()
};
try {
return {
provider: connection.adapter.getProvider(),
providerType: connection.adapter.getSupportedNamespace()
};
} catch (error) {
LogController.sendError(error, 'useProvider', 'useProvider');

// Provider not initialized yet during session restoration
return { provider: undefined, providerType: undefined };
}
}, [connection]);

return returnValue;
Expand Down