diff --git a/examples/react-waas/package.json b/examples/react-waas/package.json
index 2c9c0354..1e1e43e5 100644
--- a/examples/react-waas/package.json
+++ b/examples/react-waas/package.json
@@ -8,7 +8,8 @@
     "start": "vite --port 4444",
     "build": "tsc && vite build",
     "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "preview": "vite preview"
+    "preview": "vite preview",
+    "typecheck": "tsc --noEmit"
   },
   "dependencies": {
     "0xsequence": "^1.9.26",
diff --git a/packages/wallet/src/contexts/Navigation.tsx b/packages/wallet/src/contexts/Navigation.ts
similarity index 97%
rename from packages/wallet/src/contexts/Navigation.tsx
rename to packages/wallet/src/contexts/Navigation.ts
index be9b06bb..54080496 100644
--- a/packages/wallet/src/contexts/Navigation.tsx
+++ b/packages/wallet/src/contexts/Navigation.ts
@@ -1,6 +1,6 @@
 import { Transaction } from '@0xsequence/indexer'
 
-import { createGenericContext } from '../utils/genericContext'
+import { createGenericContext } from './genericContext'
 
 export interface CollectionDetailsParams {
   contractAddress: string
diff --git a/packages/wallet/src/contexts/WalletModal.tsx b/packages/wallet/src/contexts/WalletModal.ts
similarity index 81%
rename from packages/wallet/src/contexts/WalletModal.tsx
rename to packages/wallet/src/contexts/WalletModal.ts
index d1927fe3..d6734406 100644
--- a/packages/wallet/src/contexts/WalletModal.tsx
+++ b/packages/wallet/src/contexts/WalletModal.ts
@@ -1,6 +1,6 @@
 import React from 'react'
 
-import { createGenericContext } from '../utils/genericContext'
+import { createGenericContext } from './genericContext'
 
 type WalletModalContext = {
   setOpenWalletModal: React.Dispatch<React.SetStateAction<boolean>>
diff --git a/packages/wallet/src/utils/genericContext.ts b/packages/wallet/src/contexts/genericContext.ts
similarity index 100%
rename from packages/wallet/src/utils/genericContext.ts
rename to packages/wallet/src/contexts/genericContext.ts
diff --git a/packages/wallet/src/index.ts b/packages/wallet/src/index.ts
index 7014009a..99e83238 100644
--- a/packages/wallet/src/index.ts
+++ b/packages/wallet/src/index.ts
@@ -1,3 +1,5 @@
-export * from './hooks'
-export * from './contexts'
-export * from './shared'
+// Provider
+export { KitWalletProvider } from './shared/KitWalletProvider'
+
+// Hooks
+export { useOpenWalletModal } from './hooks/useOpenWalletModal'