Merge pull request #7 from hyli-org/callbacks

Use callbacks for wallet proper event/error handling

Author: maxgttph

front/bun.lockb

@@ -1,4 +1,3 @@
-import { useEffect } from 'react';
 import { BrowserRouter, Routes, Route, useNavigate } from 'react-router-dom';
 import './App.css';
 import { WalletShowcase } from './components/WalletShowcase';
@@ -7,11 +6,10 @@ import { useWalletTransactions } from './hooks/useWalletTransactions';
 import { useWebSocketConnection } from './hooks/useWebSocketConnection';
 import { getPublicRoutes, getProtectedRoutes, ROUTES } from './routes/routes';
 import { WalletProvider, useWallet } from 'hyli-wallet';
-import { LoadingErrorState } from './components/common/LoadingErrorState';
 import { WebSocketProvider } from './providers/WebSocketProvider';
 
 function AppContent() {
-  const { wallet, logout, stage, error } = useWallet();
+  const { wallet, logout } = useWallet();
   const navigate = useNavigate();
 
   // Use custom hooks
@@ -30,22 +28,11 @@ function AppContent() {
     }
   });
 
-  // Redirect back to root on auth settlement error and show message via state
-  useEffect(() => {
-    if (stage === 'error') {
-      navigate(ROUTES.ROOT, { state: { authError: error } });
-    }
-  }, [stage, error, navigate]);
-
   const handleLogout = () => {
     logout();
     navigate(ROUTES.ROOT);
   };
 
-  if (error) {
-    return <LoadingErrorState isLoading={false} error={error} />;
-  }
-
   // If wallet is not connected, show the showcase screen
   if (!wallet) {
     return <WalletShowcase providers={['password', 'google', 'github']} />;

front/src/App.tsx

@@ -65,13 +65,19 @@ export const SessionKeys = () => {
         password,
         expiration,
         ["oranj"],
-        (txHash: string, type: string) => {
-          if (type === 'blob') {
-            setStatus('Verifying identity...');
-            setTransactionHash(txHash);
-          } else if (type === 'proof') {
-            setStatus('Proof transaction sent, waiting for confirmation...');
+        (event) => {
+          if (event.event) {
+            if (event.event.includes('Blob transaction sent:')) {
+              const txHash = event.event.split(':')[1].trim();
+              setStatus('Verifying identity...');
+              setTransactionHash(txHash);
+            } else if (event.event.includes('Proof transaction sent:')) {
+              setStatus('Proof transaction sent, waiting for confirmation...');
+            }
           }
+        },
+        (error) => {
+          setError(error.message);
         }
       );
 
@@ -111,13 +117,19 @@ export const SessionKeys = () => {
       await removeSessionKey(
         password,
         publicKey,
-        (txHash: string, type: string) => {
-          if (type === 'blob') {
-            setStatus('Verifying identity...');
-            setTransactionHash(txHash);
-          } else if (type === 'proof') {
-            setStatus('Proof transaction sent, waiting for confirmation...');
+        (event) => {
+          if (event.event) {
+            if (event.event.includes('Blob transaction sent:')) {
+              const txHash = event.event.split(':')[1].trim();
+              setStatus('Verifying identity...');
+              setTransactionHash(txHash);
+            } else if (event.event.includes('Proof transaction sent:')) {
+              setStatus('Proof transaction sent, waiting for confirmation...');
+            }
           }
+        },
+        (error) => {
+          setError(error.message);
         }
       );