Merge pull request #15 from ostyjs/update-nostr-hooks

Update nostr hooks

package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-osty",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "type": "module",
   "license": "MIT",
   "author": "Sepehr Safari",

templates/react-shadcn/package.json

@@ -49,7 +49,7 @@
     "embla-carousel-react": "^8.4.0",
     "lucide-react": "^0.460.0",
     "next-themes": "^0.4.3",
-    "nostr-hooks": "^3.0.0",
+    "nostr-hooks": "^4.1.6",
     "nostr-tools": "^2.10.3",
     "react": "^18.3.1",
     "react-day-picker": "^9.3.2",

templates/react-shadcn/src/app/index.tsx

@@ -1,3 +1,4 @@
+import { useLogin, useNdk } from 'nostr-hooks';
 import { useEffect } from 'react';
 import { RouterProvider } from 'react-router-dom';
 
@@ -8,13 +9,12 @@ import { router } from '@/pages';
 import { ThemeProvider } from '@/shared/components/theme-provider';
 import { Toaster } from '@/shared/components/ui/toaster';
 
-import { useNdk } from '@/shared/hooks';
-
 export const App = () => {
-  const { initNdk, ndk, loginFromLocalStorage } = useNdk();
+  const { initNdk, ndk } = useNdk();
+  const { loginFromLocalStorage } = useLogin();
 
   useEffect(() => {
-    initNdk({ explicitRelayUrls: ['wss://nos.lol'] });
+    initNdk({ explicitRelayUrls: ['wss://nos.lol', 'wss://relay.primal.net'] });
   }, [initNdk]);
 
   useEffect(() => {

templates/react-shadcn/src/features/login-widget/hooks/index.ts

@@ -1,19 +1,18 @@
+import { useLogin } from 'nostr-hooks';
 import { nsecEncode } from 'nostr-tools/nip19';
 import { generateSecretKey } from 'nostr-tools/pure';
 import { useState } from 'react';
 
 import { useToast } from '@/shared/components/ui/use-toast';
 
-import { useNdk } from '@/shared/hooks';
-
 export const useLoginWidget = () => {
   const [nip46Input, setNip46Input] = useState('');
   const [nsecInput, setNsecInput] = useState('');
   const [loading, setLoading] = useState(false);
 
   const [isModalOpen, setIsModalOpen] = useState(false);
 
-  const { loginWithExtension, loginWithRemoteSigner, loginWithPrivateKey } = useNdk();
+  const { loginWithExtension, loginWithRemoteSigner, loginWithPrivateKey } = useLogin();
 
   const { toast } = useToast();
 

templates/react-shadcn/src/features/logout-widget/index.tsx

@@ -1,9 +1,9 @@
-import { Button } from '@/shared/components/ui/button';
+import { useLogin } from 'nostr-hooks';
 
-import { useNdk } from '@/shared/hooks';
+import { Button } from '@/shared/components/ui/button';
 
 export const LogoutWidget = () => {
-  const { logout } = useNdk();
+  const { logout } = useLogin();
 
   return <Button onClick={() => logout()}>Logout</Button>;
 };

templates/react-shadcn/src/features/zap-widget/hooks/index.ts

@@ -1,11 +1,9 @@
 import { NDKEvent, NDKTag, NDKUser } from '@nostr-dev-kit/ndk';
-import { useProfile } from 'nostr-hooks';
+import { useNdk, useProfile } from 'nostr-hooks';
 import { useState } from 'react';
 
 import { useToast } from '@/shared/components/ui/use-toast';
 
-import { useNdk } from '@/shared/hooks';
-
 import { ZAP_AMOUNTS } from '../config';
 import { payInvoiceByWebln } from '../utils';
 
@@ -19,7 +17,7 @@ export const useZapWidget = (target: NDKEvent | NDKUser | undefined) => {
 
   const { ndk } = useNdk();
 
-  const { profile } = useProfile(ndk, { pubkey: target?.pubkey });
+  const { profile } = useProfile({ pubkey: target?.pubkey });
 
   const process = () => {
     if (!target || !ndk) return;

templates/react-shadcn/src/pages/home/index.tsx

@@ -1,5 +1,5 @@
 import { GitHubLogoIcon } from '@radix-ui/react-icons';
-import { useActiveUser } from 'nostr-hooks';
+import { useActiveUser, useNdk } from 'nostr-hooks';
 
 import { ModeToggle } from '@/shared/components/mode-toggle';
 import { Button } from '@/shared/components/ui/button';
@@ -17,11 +17,9 @@ import { LoginWidget } from '@/features/login-widget';
 import { LogoutWidget } from '@/features/logout-widget';
 import { ZapWidget } from '@/features/zap-widget';
 
-import { useNdk } from '@/shared/hooks';
-
 export const HomePage = () => {
   const { ndk } = useNdk();
-  const { activeUser } = useActiveUser(ndk);
+  const { activeUser } = useActiveUser();
 
   const zapTarget = ndk?.getUser({
     pubkey: '3e294d2fd339bb16a5403a86e3664947dd408c4d87a0066524f8a573ae53ca8e', // Sep