Skip to content
Draft
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
36 changes: 36 additions & 0 deletions components/ui/badge.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import * as React from "react"
import { cva, type VariantProps } from "class-variance-authority"

import { cn } from "@/lib/utils"

const badgeVariants = cva(
"inline-flex items-center rounded-full border px-2.5 py-0.5 text-xs font-semibold transition-colors focus:outline-none focus:ring-2 focus:ring-ring focus:ring-offset-2",
{
variants: {
variant: {
default:
"border-transparent bg-primary text-primary-foreground hover:bg-primary/80",
secondary:
"border-transparent bg-secondary text-secondary-foreground hover:bg-secondary/80",
destructive:
"border-transparent bg-destructive text-destructive-foreground hover:bg-destructive/80",
outline: "text-foreground",
},
},
defaultVariants: {
variant: "default",
},
}
)

export interface BadgeProps
extends React.HTMLAttributes<HTMLDivElement>,
VariantProps<typeof badgeVariants> {}

function Badge({ className, variant, ...props }: BadgeProps) {
return (
<div className={cn(badgeVariants({ variant }), className)} {...props} />
)
}

export { Badge, badgeVariants }
89 changes: 70 additions & 19 deletions components/wallet/modals/private-deposit-modal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,18 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
import { Label } from "@/components/ui/label";
import { Transaction } from "@solana/web3.js";
import {
fetchRecentBlockhash,
sendSignedTransaction,
} from "@/lib/blockchain/solana-client";
Select,
SelectContent,
SelectItem,
SelectTrigger,
SelectValue,
} from "@/components/ui/select";
import { PublicKey, Transaction } from "@solana/web3.js";
import { sendSignedTransaction } from "@/lib/blockchain/solana-client";
import { X, Check } from "lucide-react";
import { deposit } from "privacycash/utils";
export * from "privacycash/utils";

interface PrivateDepositModalProps {
open: boolean;
Expand All @@ -27,35 +33,61 @@ export function PrivateDepositModal({
onOpenChange,
onSuccess,
}: PrivateDepositModalProps) {
const { activeAccount, shadowWireClient, isPrivateMode, signTransaction } =
useWallet();
const {
activeAccount,
shadowWireClient,
isPrivateMode,
signTransaction,
signVersionedTransaction,
encryptionService,
connection,
} = useWallet();
const [amount, setAmount] = useState("");
const [selectedProtocol, setSelectedProtocol] = useState("ShadowWire");
const [error, setError] = useState<string | null>(null);
const [status, setStatus] = useState<
"idle" | "loading" | "success" | "error"
>("idle");
const [txHash, setTxHash] = useState<string | null>(null);

const handleDeposit = async () => {
if (!activeAccount || !shadowWireClient || !isPrivateMode) return;
if (!activeAccount) return;

try {
setStatus("loading");
setError(null);

const depositTx = await shadowWireClient.deposit({
wallet: activeAccount.address,
amount: parseFloat(amount) * 1e9, // Convert to lamports
});
if (selectedProtocol === "ShadowWire") {
if (!shadowWireClient || !isPrivateMode) return;

const unsignedTx = Transaction.from(
Buffer.from(depositTx.unsigned_tx_base64, "base64"),
);
const depositTx = await shadowWireClient.deposit({
wallet: activeAccount.address,
amount: parseFloat(amount) * 1e9, // Convert to lamports
});

// Sign with the active account's keypair
const signedTx = await signTransaction(unsignedTx);
const txSignature = await sendSignedTransaction(signedTx);
setTxHash(txSignature);
const unsignedTx = Transaction.from(
Buffer.from(depositTx.unsigned_tx_base64, "base64"),
);

// Sign with the active account's keypair
const signedTx = await signTransaction(unsignedTx);
const txSignature = await sendSignedTransaction(signedTx);
setTxHash(txSignature);
} else if (selectedProtocol === "PrivacyCash" && encryptionService) {
const { WasmFactory } = await import("@lightprotocol/hasher.rs");
const lightWasm = await WasmFactory.getInstance();

await deposit({
lightWasm: lightWasm,
connection,
amount_in_lamports: parseFloat(amount) * 1e9,
keyBasePath: "/circuit2",
publicKey: new PublicKey(activeAccount.publicKey),
transactionSigner: signVersionedTransaction,
storage: localStorage,
encryptionService,
});
}

setStatus("success");
setAmount("");
Expand Down Expand Up @@ -124,6 +156,20 @@ export function PrivateDepositModal({
</p>

<div className="flex flex-col gap-4 w-full">
<Label htmlFor="deposit-protocol">Protocol</Label>
<Select
value={selectedProtocol}
onValueChange={setSelectedProtocol}
>
<SelectTrigger id="deposit-protocol" className="mt-1.5">
<SelectValue />
</SelectTrigger>
<SelectContent>
<SelectItem value="ShadowWire">ShadowWire</SelectItem>
<SelectItem value="PrivacyCash">Privacy Cash</SelectItem>
</SelectContent>
</Select>

<Label htmlFor="amount">Amount in SOL</Label>
<Input
id="amount"
Expand All @@ -137,7 +183,12 @@ export function PrivateDepositModal({
/>
<Button
onClick={handleDeposit}
disabled={!amount || status === "loading" || !isPrivateMode}
disabled={
!amount ||
status === "loading" ||
(selectedProtocol === "ShadowWire" &&
(!isPrivateMode || !shadowWireClient))
}
className="w-full"
>
{status === "loading" ? "Processing..." : "Deposit"}
Expand Down
13 changes: 10 additions & 3 deletions components/wallet/token-balance-card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@

import type { TokenBalance } from "@/lib/blockchain/types";
import { formatBalance, formatUsdValue } from "@/lib/blockchain/utils";
import { useWallet } from "@/contexts/wallet-context";
import { Badge } from "@/components/ui/badge";

interface TokenBalanceCardProps {
tokenBalance: TokenBalance;
}

export function TokenBalanceCard({ tokenBalance }: TokenBalanceCardProps) {
const { token, balance, usdValue } = tokenBalance;
const { token, balance, usdValue, protocol } = tokenBalance;

const displayBalance = formatBalance(balance);
const displayUsdValue = formatUsdValue(usdValue);
Expand Down Expand Up @@ -56,7 +56,14 @@ export function TokenBalanceCard({ tokenBalance }: TokenBalanceCardProps) {
)}
</div>
<div className="flex flex-col">
<span className="font-medium">{token.symbol}</span>
<div className="flex items-center gap-2">
<span className="font-medium">{token.symbol}</span>
{protocol && (
<Badge variant="secondary" className="text-xs px-1.5 py-0.5">
{protocol === "shadowwire" ? "SW" : "PC"}
</Badge>
)}
</div>
<span className="text-sm text-muted-foreground">
{displayBalance}
</span>
Expand Down
Loading