create-lightning-scaffold 1.0.2 → 1.0.5

package/templates/mobile/components/Swap.tsx.ejs

@@ -15,6 +15,7 @@ const TOKENS = [
 const SLIPPAGE_OPTIONS = [50, 100, 300];
 
 const JUPITER_API = 'https://api.jup.ag/swap/v1';
+const JUP_API_KEY = process.env.EXPO_PUBLIC_JUPITER_API_KEY || '';
 
 function useBalances(walletAddress: string | undefined) {
   const [balances, setBalances] = useState<Record<string, number>>({});
@@ -23,9 +24,7 @@ function useBalances(walletAddress: string | undefined) {
     const rpc = process.env.EXPO_PUBLIC_SOLANA_RPC || 'https://api.devnet.solana.com';
     const conn = new Connection(rpc);
     const pk = new PublicKey(walletAddress);
-    
     conn.getBalance(pk).then((bal) => setBalances((b) => ({ ...b, SOL: bal / 1e9 }))).catch(() => {});
-    
     conn.getParsedTokenAccountsByOwner(pk, { programId: new PublicKey('TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA') })
       .then((res) => {
         const tokenBals: Record<string, number> = {};
@@ -39,13 +38,6 @@ function useBalances(walletAddress: string | undefined) {
   }, [walletAddress]);
   return balances;
 }
-
-const TOKENS = [
-  { symbol: 'SOL', mint: 'So11111111111111111111111111111111111111112', decimals: 9 },
-  { symbol: 'USDC', mint: 'EPjFWdd5AufqSSqeM2qN1xzybapC8G4wEGGkZwyTDt1v', decimals: 6 },
-];
-
-const JUPITER_API = 'https://api.jup.ag/swap/v1';
 <% if (styling !== 'nativewind') { %>
 const styles = StyleSheet.create({
   container: { flex: 1, backgroundColor: '#fff', padding: 24, paddingTop: 60 },
@@ -101,22 +93,20 @@ export function Swap() {
   const [showPicker, setShowPicker] = useState<'from' | 'to' | null>(null);
   const redirectUrl = Linking.createURL('/');
 
-  const switchTokens = () => {
-    setFromToken(toToken);
-    setToToken(fromToken);
-    setAmount('');
-    setQuote(null);
-  };
+  const switchTokens = () => { setFromToken(toToken); setToToken(fromToken); setAmount(''); setQuote(null); };
 
   useEffect(() => {
     if (!amount || parseFloat(amount) <= 0) { setQuote(null); return; }
     const timeout = setTimeout(async () => {
       try {
         const inputAmount = Math.floor(parseFloat(amount) * 10 ** fromToken.decimals);
-        const res = await fetch(`${JUPITER_API}/quote?inputMint=${fromToken.mint}&outputMint=${toToken.mint}&amount=${inputAmount}&slippageBps=${slippage}`);
+        const headers: Record<string, string> = {};
+        if (JUP_API_KEY) headers['x-api-key'] = JUP_API_KEY;
+        const res = await fetch(`${JUPITER_API}/quote?inputMint=${fromToken.mint}&outputMint=${toToken.mint}&amount=${inputAmount}&slippageBps=${slippage}&restrictIntermediateTokens=true`, { headers });
         const data = await res.json();
         if (data.outAmount) setQuote(data);
-      } catch (e) { console.error('Quote error:', e); }
+        else setQuote(null);
+      } catch (e) { console.error('Quote error:', e); setQuote(null); }
     }, 500);
     return () => clearTimeout(timeout);
   }, [amount, fromToken, toToken, slippage]);
@@ -125,34 +115,48 @@ export function Swap() {
 
   const handleSwap = async () => {
     if (!wallet?.smartWallet || !quote) return;
-    setLoading(true);
-    setResult(null);
+    setLoading(true); setResult(null);
     try {
-      const swapRes = await fetch(`${JUPITER_API}/swap`, {
-        method: 'POST',
-        headers: { 'Content-Type': 'application/json' },
-        body: JSON.stringify({ quoteResponse: quote, userPublicKey: wallet.smartWallet, dynamicComputeUnitLimit: true, dynamicSlippage: true }),
+      const headers: Record<string, string> = { 'Content-Type': 'application/json' };
+      if (JUP_API_KEY) headers['x-api-key'] = JUP_API_KEY;
+      const swapRes = await fetch(`${JUPITER_API}/swap-instructions`, {
+        method: 'POST', headers,
+        body: JSON.stringify({ quoteResponse: quote, userPublicKey: wallet.smartWallet, wrapAndUnwrapSol: true, dynamicComputeUnitLimit: true }),
+      });
+      if (!swapRes.ok) throw new Error(`Jupiter API error: ${await swapRes.text()}`);
+      const { setupInstructions = [], swapInstruction, cleanupInstruction, addressLookupTableAddresses = [] } = await swapRes.json();
+      if (!swapInstruction) throw new Error('No swap instruction returned');
+
+      const toInstruction = (ix: any) => ({
+        programId: new PublicKey(ix.programId),
+        keys: ix.accounts.map((acc: any) => ({ pubkey: new PublicKey(acc.pubkey), isSigner: acc.isSigner, isWritable: acc.isWritable })),
+        data: Buffer.from(ix.data, 'base64'),
       });
-      const { swapTransaction } = await swapRes.json();
-      const sig = await signAndSendTransaction({ instructions: [], transactionOptions: { feeToken: 'USDC' } }, { redirectUrl });
+      const instructions = [...setupInstructions.map(toInstruction), toInstruction(swapInstruction), ...(cleanupInstruction ? [toInstruction(cleanupInstruction)] : [])];
+
+      let addressLookupTableAccounts: any[] = [];
+      if (addressLookupTableAddresses.length > 0) {
+        const rpc = process.env.EXPO_PUBLIC_SOLANA_RPC || 'https://api.devnet.solana.com';
+        const conn = new Connection(rpc);
+        const alts = await Promise.all(addressLookupTableAddresses.map(async (addr: string) => (await conn.getAddressLookupTable(new PublicKey(addr))).value));
+        addressLookupTableAccounts = alts.filter(Boolean);
+      }
+
+      const sig = await signAndSendTransaction({ instructions, transactionOptions: { feeToken: 'USDC', addressLookupTableAccounts } }, { redirectUrl });
       setResult({ success: true, message: `Swapped! ${sig.slice(0, 8)}...` });
-      setAmount('');
-      setQuote(null);
-    } catch (e) {
-      setResult({ success: false, message: e instanceof Error ? e.message : 'Swap failed' });
-    } finally { setLoading(false); }
+      setAmount(''); setQuote(null);
+    } catch (e) { console.error('Swap error:', e); setResult({ success: false, message: e instanceof Error ? e.message : 'Swap failed' }); }
+    finally { setLoading(false); }
   };
 
   const handleSignMessage = async () => {
-    setSigning(true);
-    setResult(null);
+    setSigning(true); setResult(null);
     try {
       const message = `Verify wallet ownership\nTimestamp: ${Date.now()}`;
       const signature = await signMessage(message, { redirectUrl });
       setResult({ success: true, message: `Signed: ${signature.slice(0, 16)}...` });
-    } catch (e) {
-      setResult({ success: false, message: e instanceof Error ? e.message : 'Sign failed' });
-    } finally { setSigning(false); }
+    } catch (e) { console.error('Sign error:', e); setResult({ success: false, message: e instanceof Error ? e.message : 'Sign failed' }); }
+    finally { setSigning(false); }
   };
 
   const addr = wallet?.smartWallet || '';
@@ -161,152 +165,54 @@ export function Swap() {
 <% if (styling === 'nativewind') { %>
     <View className="flex-1 bg-white p-6 pt-16">
       <View className="bg-neutral-900 rounded-2xl p-5">
-        <View className="flex-row items-center justify-between mb-6">
-          <Text className="text-lg font-semibold text-white">Swap</Text>
-          <TouchableOpacity onPress={() => disconnect()}>
-            <Text className="text-xs text-neutral-500">{addr.slice(0, 6)}...{addr.slice(-4)}</Text>
-          </TouchableOpacity>
-        </View>
-
+        <View className="flex-row items-center justify-between mb-6"><Text className="text-lg font-semibold text-white">Swap</Text><TouchableOpacity onPress={() => disconnect()}><Text className="text-xs text-neutral-500">{addr.slice(0, 6)}...{addr.slice(-4)}</Text></TouchableOpacity></View>
         <View className="bg-neutral-800 border border-neutral-700 rounded-xl p-4">
-          <View className="flex-row justify-between mb-2">
-            <Text className="text-xs text-neutral-500">From</Text>
-            <Text className="text-xs text-neutral-500">Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</Text>
-          </View>
-          <View className="flex-row items-center">
-            <TextInput className="flex-1 text-2xl font-medium text-white" placeholder="0.00" placeholderTextColor="#737373" value={amount} onChangeText={setAmount} keyboardType="numeric" />
-            <TouchableOpacity className="flex-row items-center bg-neutral-700 px-3 py-2 rounded-lg" onPress={() => setShowPicker('from')}>
-              <Text className="text-sm font-medium text-white mr-1">{fromToken.symbol}</Text><Text className="text-xs text-neutral-400">▼</Text>
-            </TouchableOpacity>
-          </View>
+          <View className="flex-row justify-between mb-2"><Text className="text-xs text-neutral-500">From</Text><Text className="text-xs text-neutral-500">Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</Text></View>
+          <View className="flex-row items-center"><TextInput className="flex-1 text-2xl font-medium text-white" placeholder="0.00" placeholderTextColor="#737373" value={amount} onChangeText={setAmount} keyboardType="numeric" /><TouchableOpacity className="flex-row items-center bg-neutral-700 px-3 py-2 rounded-lg" onPress={() => setShowPicker('from')}><Text className="text-sm font-medium text-white mr-1">{fromToken.symbol}</Text><Text className="text-xs text-neutral-400">▼</Text></TouchableOpacity></View>
           <TouchableOpacity onPress={() => setAmount(String(balances[fromToken.symbol] ?? 0))}><Text className="text-xs text-neutral-500 mt-1">Max</Text></TouchableOpacity>
         </View>
-
-        <View className="items-center my-2">
-          <TouchableOpacity onPress={switchTokens} className="w-8 h-8 bg-neutral-800 border border-neutral-700 rounded-lg items-center justify-center"><Text className="text-neutral-500">↓</Text></TouchableOpacity>
-        </View>
-
+        <View className="items-center my-2"><TouchableOpacity onPress={switchTokens} className="w-8 h-8 bg-neutral-800 border border-neutral-700 rounded-lg items-center justify-center"><Text className="text-neutral-500">↓</Text></TouchableOpacity></View>
         <View className="bg-neutral-800 border border-neutral-700 rounded-xl p-4">
-          <View className="flex-row justify-between mb-2">
-            <Text className="text-xs text-neutral-500">To</Text>
-            <Text className="text-xs text-neutral-500">Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</Text>
-          </View>
-          <View className="flex-row items-center">
-            <Text className="flex-1 text-2xl font-medium text-neutral-500">{outputAmount}</Text>
-            <TouchableOpacity className="flex-row items-center bg-neutral-700 px-3 py-2 rounded-lg" onPress={() => setShowPicker('to')}>
-              <Text className="text-sm font-medium text-white mr-1">{toToken.symbol}</Text><Text className="text-xs text-neutral-400">▼</Text>
-            </TouchableOpacity>
-          </View>
+          <View className="flex-row justify-between mb-2"><Text className="text-xs text-neutral-500">To</Text><Text className="text-xs text-neutral-500">Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</Text></View>
+          <View className="flex-row items-center"><Text className="flex-1 text-2xl font-medium text-neutral-500">{outputAmount}</Text><TouchableOpacity className="flex-row items-center bg-neutral-700 px-3 py-2 rounded-lg" onPress={() => setShowPicker('to')}><Text className="text-sm font-medium text-white mr-1">{toToken.symbol}</Text><Text className="text-xs text-neutral-400">▼</Text></TouchableOpacity></View>
           {quote && <Text className="text-xs text-neutral-500 mt-2">via Jupiter · {quote.routePlan?.[0]?.swapInfo?.label || 'Best route'}</Text>}
         </View>
-
-        <View className="flex-row items-center justify-between mt-3">
-          <Text className="text-xs text-neutral-500">Slippage</Text>
-          <View className="flex-row gap-1">
-            {SLIPPAGE_OPTIONS.map((s) => (
-              <TouchableOpacity key={s} onPress={() => setSlippage(s)} className={`px-2 py-1 rounded ${slippage === s ? 'bg-white' : 'bg-neutral-700'}`}>
-                <Text className={`text-xs ${slippage === s ? 'text-black' : 'text-neutral-400'}`}>{s / 100}%</Text>
-              </TouchableOpacity>
-            ))}
-          </View>
-        </View>
-
-        <TouchableOpacity className={`mt-4 bg-white py-3.5 rounded-xl items-center ${loading || !quote ? 'opacity-50' : ''}`} onPress={handleSwap} disabled={loading || !quote}>
-          {loading ? <ActivityIndicator color="#0a0a0a" size="small" /> : <Text className="text-black text-sm font-medium">Swap</Text>}
-        </TouchableOpacity>
-
-        <TouchableOpacity className={`mt-2 border border-neutral-700 py-3 rounded-xl items-center ${signing ? 'opacity-50' : ''}`} onPress={handleSignMessage} disabled={signing}>
-          {signing ? <ActivityIndicator color="#fafafa" size="small" /> : <Text className="text-white text-sm font-medium">Sign Message</Text>}
-        </TouchableOpacity>
-
+        <View className="flex-row items-center justify-between mt-3"><Text className="text-xs text-neutral-500">Slippage</Text><View className="flex-row gap-1">{SLIPPAGE_OPTIONS.map((s) => (<TouchableOpacity key={s} onPress={() => setSlippage(s)} className={`px-2 py-1 rounded ${slippage === s ? 'bg-white' : 'bg-neutral-700'}`}><Text className={`text-xs ${slippage === s ? 'text-black' : 'text-neutral-400'}`}>{s / 100}%</Text></TouchableOpacity>))}</View></View>
+        <TouchableOpacity className={`mt-4 bg-white py-3.5 rounded-xl items-center ${loading || !quote ? 'opacity-50' : ''}`} onPress={handleSwap} disabled={loading || !quote}>{loading ? <ActivityIndicator color="#0a0a0a" size="small" /> : <Text className="text-black text-sm font-medium">Swap</Text>}</TouchableOpacity>
+        <TouchableOpacity className={`mt-2 border border-neutral-700 py-3 rounded-xl items-center ${signing ? 'opacity-50' : ''}`} onPress={handleSignMessage} disabled={signing}>{signing ? <ActivityIndicator color="#fafafa" size="small" /> : <Text className="text-white text-sm font-medium">Sign Message</Text>}</TouchableOpacity>
         {result && <Text className={`mt-3 text-sm text-center ${result.success ? 'text-neutral-400' : 'text-red-400'}`}>{result.message}</Text>}
         <Text className="mt-4 text-xs text-center text-neutral-500">Gas sponsored · Powered by LazorKit + Jupiter</Text>
       </View>
-
       <Modal visible={!!showPicker} transparent animationType="slide" onRequestClose={() => setShowPicker(null)}>
         <TouchableOpacity className="flex-1 justify-end bg-black/50" activeOpacity={1} onPress={() => setShowPicker(null)}>
-          <View className="bg-neutral-800 rounded-t-2xl p-4 pb-8">
-            <Text className="text-base font-semibold text-center mb-4 text-white">Select Token</Text>
-            {TOKENS.filter(t => t.symbol !== (showPicker === 'from' ? toToken.symbol : fromToken.symbol)).map(t => (
-              <TouchableOpacity key={t.symbol} className="py-3.5 border-b border-neutral-700" onPress={() => { showPicker === 'from' ? setFromToken(t) : setToToken(t); setShowPicker(null); }}>
-                <Text className="text-base text-white">{t.symbol}</Text>
-              </TouchableOpacity>
-            ))}
-          </View>
+          <View className="bg-neutral-800 rounded-t-2xl p-4 pb-8"><Text className="text-base font-semibold text-center mb-4 text-white">Select Token</Text>{TOKENS.filter(t => t.symbol !== (showPicker === 'from' ? toToken.symbol : fromToken.symbol)).map(t => (<TouchableOpacity key={t.symbol} className="py-3.5 border-b border-neutral-700" onPress={() => { showPicker === 'from' ? setFromToken(t) : setToToken(t); setShowPicker(null); }}><Text className="text-base text-white">{t.symbol}</Text></TouchableOpacity>))}</View>
         </TouchableOpacity>
       </Modal>
     </View>
 <% } else { %>
     <View style={styles.container}>
       <View style={styles.card}>
-        <View style={styles.header}>
-          <Text style={styles.title}>Swap</Text>
-          <TouchableOpacity onPress={() => disconnect()}><Text style={styles.address}>{addr.slice(0, 6)}...{addr.slice(-4)}</Text></TouchableOpacity>
-        </View>
-
+        <View style={styles.header}><Text style={styles.title}>Swap</Text><TouchableOpacity onPress={() => disconnect()}><Text style={styles.address}>{addr.slice(0, 6)}...{addr.slice(-4)}</Text></TouchableOpacity></View>
         <View style={styles.inputCard}>
-          <View style={styles.labelRow}>
-            <Text style={styles.label}>From</Text>
-            <Text style={styles.label}>Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</Text>
-          </View>
-          <View style={styles.inputRow}>
-            <TextInput style={styles.input} placeholder="0.00" placeholderTextColor="#737373" value={amount} onChangeText={setAmount} keyboardType="numeric" />
-            <TouchableOpacity style={styles.tokenBtn} onPress={() => setShowPicker('from')}>
-              <Text style={styles.tokenText}>{fromToken.symbol}</Text><Text style={styles.tokenArrow}>▼</Text>
-            </TouchableOpacity>
-          </View>
+          <View style={styles.labelRow}><Text style={styles.label}>From</Text><Text style={styles.label}>Balance: {(balances[fromToken.symbol] ?? 0).toFixed(4)}</Text></View>
+          <View style={styles.inputRow}><TextInput style={styles.input} placeholder="0.00" placeholderTextColor="#737373" value={amount} onChangeText={setAmount} keyboardType="numeric" /><TouchableOpacity style={styles.tokenBtn} onPress={() => setShowPicker('from')}><Text style={styles.tokenText}>{fromToken.symbol}</Text><Text style={styles.tokenArrow}>▼</Text></TouchableOpacity></View>
           <TouchableOpacity onPress={() => setAmount(String(balances[fromToken.symbol] ?? 0))}><Text style={styles.switchText}>Max</Text></TouchableOpacity>
         </View>
-
         <View style={styles.arrow}><TouchableOpacity onPress={switchTokens} style={styles.arrowBox}><Text style={styles.arrowText}>↓</Text></TouchableOpacity></View>
-
         <View style={styles.inputCard}>
-          <View style={styles.labelRow}>
-            <Text style={styles.label}>To</Text>
-            <Text style={styles.label}>Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</Text>
-          </View>
-          <View style={styles.inputRow}>
-            <Text style={styles.outputText}>{outputAmount}</Text>
-            <TouchableOpacity style={styles.tokenBtn} onPress={() => setShowPicker('to')}>
-              <Text style={styles.tokenText}>{toToken.symbol}</Text><Text style={styles.tokenArrow}>▼</Text>
-            </TouchableOpacity>
-          </View>
+          <View style={styles.labelRow}><Text style={styles.label}>To</Text><Text style={styles.label}>Balance: {(balances[toToken.symbol] ?? 0).toFixed(4)}</Text></View>
+          <View style={styles.inputRow}><Text style={styles.outputText}>{outputAmount}</Text><TouchableOpacity style={styles.tokenBtn} onPress={() => setShowPicker('to')}><Text style={styles.tokenText}>{toToken.symbol}</Text><Text style={styles.tokenArrow}>▼</Text></TouchableOpacity></View>
           {quote && <Text style={styles.quote}>via Jupiter · {quote.routePlan?.[0]?.swapInfo?.label || 'Best route'}</Text>}
         </View>
-
-        <View style={styles.slippageRow}>
-          <Text style={styles.slippageLabel}>Slippage</Text>
-          <View style={{ flexDirection: 'row', gap: 4 }}>
-            {SLIPPAGE_OPTIONS.map((s) => (
-              <TouchableOpacity key={s} onPress={() => setSlippage(s)} style={[styles.slippageBtn, slippage === s && styles.slippageBtnActive]}>
-                <Text style={[styles.slippageBtnText, slippage === s && styles.slippageBtnTextActive]}>{s / 100}%</Text>
-              </TouchableOpacity>
-            ))}
-          </View>
-        </View>
-
-        <TouchableOpacity style={[styles.button, (loading || !quote) && styles.buttonDisabled]} onPress={handleSwap} disabled={loading || !quote}>
-          {loading ? <ActivityIndicator color="#0a0a0a" size="small" /> : <Text style={styles.buttonText}>Swap</Text>}
-        </TouchableOpacity>
-
-        <TouchableOpacity style={[styles.buttonSecondary, signing && styles.buttonDisabled]} onPress={handleSignMessage} disabled={signing}>
-          {signing ? <ActivityIndicator color="#fafafa" size="small" /> : <Text style={styles.buttonTextSecondary}>Sign Message</Text>}
-        </TouchableOpacity>
-
+        <View style={styles.slippageRow}><Text style={styles.slippageLabel}>Slippage</Text><View style={{ flexDirection: 'row', gap: 4 }}>{SLIPPAGE_OPTIONS.map((s) => (<TouchableOpacity key={s} onPress={() => setSlippage(s)} style={[styles.slippageBtn, slippage === s && styles.slippageBtnActive]}><Text style={[styles.slippageBtnText, slippage === s && styles.slippageBtnTextActive]}>{s / 100}%</Text></TouchableOpacity>))}</View></View>
+        <TouchableOpacity style={[styles.button, (loading || !quote) && styles.buttonDisabled]} onPress={handleSwap} disabled={loading || !quote}>{loading ? <ActivityIndicator color="#0a0a0a" size="small" /> : <Text style={styles.buttonText}>Swap</Text>}</TouchableOpacity>
+        <TouchableOpacity style={[styles.buttonSecondary, signing && styles.buttonDisabled]} onPress={handleSignMessage} disabled={signing}>{signing ? <ActivityIndicator color="#fafafa" size="small" /> : <Text style={styles.buttonTextSecondary}>Sign Message</Text>}</TouchableOpacity>
         {result && <Text style={[styles.result, { color: result.success ? '#737373' : '#ef4444' }]}>{result.message}</Text>}
         <Text style={styles.footer}>Gas sponsored · Powered by LazorKit + Jupiter</Text>
       </View>
-
       <Modal visible={!!showPicker} transparent animationType="slide" onRequestClose={() => setShowPicker(null)}>
         <TouchableOpacity style={styles.modal} activeOpacity={1} onPress={() => setShowPicker(null)}>
-          <View style={styles.modalContent}>
-            <Text style={styles.modalTitle}>Select Token</Text>
-            {TOKENS.filter(t => t.symbol !== (showPicker === 'from' ? toToken.symbol : fromToken.symbol)).map(t => (
-              <TouchableOpacity key={t.symbol} style={styles.modalItem} onPress={() => { showPicker === 'from' ? setFromToken(t) : setToToken(t); setShowPicker(null); }}>
-                <Text style={styles.modalItemText}>{t.symbol}</Text>
-              </TouchableOpacity>
-            ))}
-          </View>
+          <View style={styles.modalContent}><Text style={styles.modalTitle}>Select Token</Text>{TOKENS.filter(t => t.symbol !== (showPicker === 'from' ? toToken.symbol : fromToken.symbol)).map(t => (<TouchableOpacity key={t.symbol} style={styles.modalItem} onPress={() => { showPicker === 'from' ? setFromToken(t) : setToToken(t); setShowPicker(null); }}><Text style={styles.modalItemText}>{t.symbol}</Text></TouchableOpacity>))}</View>
         </TouchableOpacity>
       </Modal>
     </View>

package/templates/state/redux/index.ts

@@ -1,26 +1,21 @@
 import { configureStore, createSlice, PayloadAction } from "@reduxjs/toolkit";
 import { useDispatch, useSelector, TypedUseSelectorHook } from "react-redux";
-import type { LazorWallet } from "../lazorkit";
 
 interface AppState {
-  wallet: LazorWallet | null;
   isLoading: boolean;
 }
 
 const appSlice = createSlice({
   name: "app",
-  initialState: { wallet: null, isLoading: false } as AppState,
+  initialState: { isLoading: false } as AppState,
   reducers: {
-    setWallet: (state, action: PayloadAction<LazorWallet | null>) => {
-      state.wallet = action.payload;
-    },
     setLoading: (state, action: PayloadAction<boolean>) => {
       state.isLoading = action.payload;
     },
   },
 });
 
-export const { setWallet, setLoading } = appSlice.actions;
+export const { setLoading } = appSlice.actions;
 
 export const store = configureStore({ reducer: { app: appSlice.reducer } });
 

package/templates/state/zustand/index.ts

@@ -1,16 +1,11 @@
 import { create } from "zustand";
-import type { LazorWallet } from "../lazorkit";
 
 interface AppState {
-  wallet: LazorWallet | null;
-  setWallet: (wallet: LazorWallet | null) => void;
   isLoading: boolean;
   setLoading: (loading: boolean) => void;
 }
 
 export const useStore = create<AppState>((set) => ({
-  wallet: null,
-  setWallet: (wallet) => set({ wallet }),
   isLoading: false,
   setLoading: (isLoading) => set({ isLoading }),
 }));

package/templates/vite/src/components/History.tsx.ejs

@@ -3,18 +3,18 @@ import { useWallet } from "@lazorkit/wallet";
 import { Connection, PublicKey } from "@solana/web3.js";
 <% if (styling !== 'tailwind') { %>
 const styles: Record<string, React.CSSProperties> = {
-  container: { width: '100%', maxWidth: 360 },
+  container: { width: '100%', maxWidth: 360, background: '#0a0a0a', borderRadius: 16, padding: 24, color: '#fafafa' },
   header: { display: 'flex', alignItems: 'center', justifyContent: 'space-between', marginBottom: 16 },
-  title: { fontSize: 18, fontWeight: 600, margin: 0 },
+  title: { fontSize: 18, fontWeight: 600, margin: 0, color: '#fafafa' },
   list: { display: 'flex', flexDirection: 'column', gap: 8 },
-  item: { border: '1px solid #e5e5e5', borderRadius: 12, padding: 12, textDecoration: 'none', color: 'inherit' },
+  item: { border: '1px solid #262626', borderRadius: 12, padding: 12, textDecoration: 'none', color: '#fafafa', background: '#171717' },
   row: { display: 'flex', justifyContent: 'space-between', alignItems: 'center' },
-  sig: { fontFamily: 'monospace', fontSize: 13, color: '#0a0a0a' },
-  time: { fontSize: 12, color: '#a3a3a3' },
+  sig: { fontFamily: 'monospace', fontSize: 13, color: '#fafafa' },
+  time: { fontSize: 12, color: '#737373', marginTop: 4 },
   status: { fontSize: 11, padding: '2px 6px', borderRadius: 4 },
-  success: { backgroundColor: '#dcfce7', color: '#166534' },
-  failed: { backgroundColor: '#fee2e2', color: '#991b1b' },
-  empty: { textAlign: 'center', padding: 32, color: '#a3a3a3', fontSize: 14 },
+  success: { backgroundColor: '#14532d', color: '#4ade80' },
+  failed: { backgroundColor: '#7f1d1d', color: '#f87171' },
+  empty: { textAlign: 'center', padding: 32, color: '#737373', fontSize: 14 },
   back: { fontSize: 13, color: '#737373', background: 'none', border: 'none', cursor: 'pointer' },
 };
 <% } %>
@@ -25,7 +25,7 @@ interface Props {
 interface TxInfo {
   signature: string;
   slot: number;
-  blockTime: number | null;
+  blockTime: number | null | undefined;
   err: any;
 }
 
@@ -56,26 +56,26 @@ export function History({ onBack }: Props) {
 
   return (
 <% if (styling === 'tailwind') { %>
-    <div className="w-full max-w-sm">
+    <div className="w-full max-w-sm bg-neutral-900 rounded-2xl p-6 text-white">
       <div className="flex items-center justify-between mb-4">
         <h1 className="text-lg font-semibold">History</h1>
-        <button onClick={onBack} className="text-sm text-neutral-500 hover:text-black">← Back</button>
+        <button onClick={onBack} className="text-sm text-neutral-500 hover:text-white">← Back</button>
       </div>
       {loading ? (
-        <p className="text-center py-8 text-neutral-400">Loading...</p>
+        <p className="text-center py-8 text-neutral-500">Loading...</p>
       ) : txs.length === 0 ? (
-        <p className="text-center py-8 text-neutral-400">No transactions yet</p>
+        <p className="text-center py-8 text-neutral-500">No transactions yet</p>
       ) : (
         <div className="space-y-2">
           {txs.map((tx) => (
-            <a key={tx.signature} href={explorerUrl(tx.signature)} target="_blank" rel="noopener noreferrer" className="block border border-neutral-200 rounded-xl p-3 hover:bg-neutral-50">
+            <a key={tx.signature} href={explorerUrl(tx.signature)} target="_blank" rel="noopener noreferrer" className="block border border-neutral-700 rounded-xl p-3 bg-neutral-800 hover:bg-neutral-700">
               <div className="flex justify-between items-center">
                 <span className="font-mono text-sm">{tx.signature.slice(0, 8)}...{tx.signature.slice(-8)}</span>
-                <span className={`text-xs px-2 py-0.5 rounded ${tx.err ? "bg-red-100 text-red-700" : "bg-green-100 text-green-700"}`}>
+                <span className={`text-xs px-2 py-0.5 rounded ${tx.err ? "bg-red-900 text-red-400" : "bg-green-900 text-green-400"}`}>
                   {tx.err ? "Failed" : "Success"}
                 </span>
               </div>
-              <p className="text-xs text-neutral-400 mt-1">{formatTime(tx.blockTime)}</p>
+              <p className="text-xs text-neutral-500 mt-1">{formatTime(tx.blockTime)}</p>
             </a>
           ))}
         </div>

package/templates/vite/src/components/Recovery.tsx.ejs

@@ -2,15 +2,15 @@ import { useState } from "react";
 import { useWallet } from "@lazorkit/wallet";
 <% if (styling !== 'tailwind') { %>
 const styles: Record<string, React.CSSProperties> = {
-  container: { width: '100%', maxWidth: 360 },
-  title: { fontSize: 18, fontWeight: 600, margin: 0 },
+  container: { width: '100%', maxWidth: 360, background: '#0a0a0a', borderRadius: 16, padding: 24, color: '#fafafa' },
+  title: { fontSize: 18, fontWeight: 600, margin: 0, color: '#fafafa' },
   subtitle: { marginTop: 8, fontSize: 14, color: '#737373', lineHeight: 1.5 },
-  card: { marginTop: 16, border: '1px solid #e5e5e5', borderRadius: 12, padding: 16 },
-  cardTitle: { fontSize: 14, fontWeight: 500, margin: 0 },
+  card: { marginTop: 16, border: '1px solid #262626', borderRadius: 12, padding: 16, background: '#171717' },
+  cardTitle: { fontSize: 14, fontWeight: 500, margin: 0, color: '#fafafa' },
   cardDesc: { marginTop: 4, fontSize: 13, color: '#737373' },
-  button: { marginTop: 12, width: '100%', backgroundColor: '#0a0a0a', color: '#fff', padding: '12px 16px', borderRadius: 10, border: 'none', fontSize: 14, fontWeight: 500, cursor: 'pointer' },
-  buttonSecondary: { marginTop: 12, width: '100%', backgroundColor: 'transparent', color: '#0a0a0a', padding: '12px 16px', borderRadius: 10, border: '1px solid #e5e5e5', fontSize: 14, fontWeight: 500, cursor: 'pointer' },
-  info: { marginTop: 16, padding: 12, backgroundColor: '#f5f5f5', borderRadius: 8, fontSize: 12, color: '#525252' },
+  button: { marginTop: 12, width: '100%', backgroundColor: '#fafafa', color: '#0a0a0a', padding: '12px 16px', borderRadius: 10, border: 'none', fontSize: 14, fontWeight: 500, cursor: 'pointer' },
+  buttonSecondary: { marginTop: 12, width: '100%', backgroundColor: 'transparent', color: '#fafafa', padding: '12px 16px', borderRadius: 10, border: '1px solid #262626', fontSize: 14, fontWeight: 500, cursor: 'pointer' },
+  info: { marginTop: 16, padding: 12, backgroundColor: '#171717', borderRadius: 8, fontSize: 12, color: '#a3a3a3' },
   back: { marginTop: 16, fontSize: 13, color: '#737373', background: 'none', border: 'none', cursor: 'pointer' },
 };
 <% } %>
@@ -24,11 +24,17 @@ export function Recovery({ onBack }: Props) {
   const portalUrl = import.meta.env.VITE_LAZORKIT_PORTAL_URL || "https://portal.lazor.sh";
 
   const handleAddDevice = () => {
-    window.open(`${portalUrl}/recovery/add-device`, "_blank");
+    const url = wallet?.smartWallet 
+      ? `${portalUrl}?wallet=${wallet.smartWallet}&action=add-device`
+      : portalUrl;
+    window.open(url, "_blank");
   };
 
   const handleManageDevices = () => {
-    window.open(`${portalUrl}/recovery/devices`, "_blank");
+    const url = wallet?.smartWallet 
+      ? `${portalUrl}?wallet=${wallet.smartWallet}&action=manage-devices`
+      : portalUrl;
+    window.open(url, "_blank");
   };
 
   const copyAddress = () => {
@@ -41,36 +47,36 @@ export function Recovery({ onBack }: Props) {
 
   return (
 <% if (styling === 'tailwind') { %>
-    <div className="w-full max-w-sm">
+    <div className="w-full max-w-sm bg-neutral-900 rounded-2xl p-6 text-white">
       <h1 className="text-lg font-semibold">Recovery & Backup</h1>
       <p className="mt-2 text-sm text-neutral-500">
         Add backup passkeys from other devices to ensure you never lose access.
       </p>
-      <div className="mt-4 border border-neutral-200 rounded-xl p-4">
+      <div className="mt-4 border border-neutral-700 rounded-xl p-4 bg-neutral-800">
         <h3 className="text-sm font-medium">Add Backup Device</h3>
         <p className="mt-1 text-xs text-neutral-500">
           Register a passkey from another phone, tablet, or computer.
         </p>
-        <button onClick={handleAddDevice} className="mt-3 w-full py-3 bg-black text-white text-sm font-medium rounded-lg hover:opacity-90">
+        <button onClick={handleAddDevice} className="mt-3 w-full py-3 bg-white text-black text-sm font-medium rounded-lg hover:opacity-90">
           Add Device
         </button>
       </div>
-      <div className="mt-3 border border-neutral-200 rounded-xl p-4">
+      <div className="mt-3 border border-neutral-700 rounded-xl p-4 bg-neutral-800">
         <h3 className="text-sm font-medium">Manage Devices</h3>
         <p className="mt-1 text-xs text-neutral-500">
           View and remove registered passkeys.
         </p>
-        <button onClick={handleManageDevices} className="mt-3 w-full py-3 bg-transparent text-black text-sm font-medium rounded-lg border border-neutral-200 hover:bg-neutral-50">
+        <button onClick={handleManageDevices} className="mt-3 w-full py-3 bg-transparent text-white text-sm font-medium rounded-lg border border-neutral-700 hover:bg-neutral-700">
           View Devices
         </button>
       </div>
-      <div className="mt-4 p-3 bg-neutral-100 rounded-lg">
-        <p className="text-xs text-neutral-600">
+      <div className="mt-4 p-3 bg-neutral-800 rounded-lg">
+        <p className="text-xs text-neutral-400">
           <strong>Wallet:</strong>{" "}
-          <button onClick={copyAddress} className="font-mono hover:text-black">
+          <button onClick={copyAddress} className="font-mono hover:text-white">
             {wallet?.smartWallet?.slice(0, 8)}...{wallet?.smartWallet?.slice(-8)}
           </button>
-          {copied && <span className="ml-2 text-green-600">Copied!</span>}
+          {copied && <span className="ml-2 text-green-400">Copied!</span>}
         </p>
       </div>
       <button onClick={onBack} className="mt-4 text-sm text-neutral-500 hover:text-black">