Skip to content

activity and transfer improvements #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dariel-urbina wants to merge 1 commit into
base: main
Choose a base branch
from
+38 −21
Open

activity and transfer improvements #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 13 additions & 5 deletions components/activity.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ export function Activity() {
<div className="max-h-[378px] overflow-y-auto space-y-3">
{transfers.data.map((tx: any, index: number) => {
const isIncoming = tx.type === "wallets.transfer.in";
const explorerUrl = tx.onChain?.explorerLink ?? null;
const counterpartyAddress = isIncoming
? tx.sender?.address
: tx.recipient?.address;
return (
<div
key={tx.transferId ?? tx.onChain?.txId ?? index}
Expand Down Expand Up @@ -116,11 +120,15 @@ export function Activity() {
</span>
</div>
<div className="text-xs text-gray-500 font-mono">
{isIncoming
? `From ${formatAddress(tx.sender?.address ?? "")}`
: `To ${formatAddress(
tx.recipient?.address ?? ""
)}`}
{isIncoming ? "From" : "To"}{" "}
<a
href={explorerUrl ?? undefined}
target="_blank"
rel="noopener noreferrer"
className="underline text-blue-600 hover:text-blue-800 transition-colors"
>
{counterpartyAddress ? formatAddress(counterpartyAddress) : ""}
</a>
</div>
</div>
</div>
Expand Down
41 changes: 25 additions & 16 deletions components/transfer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,25 @@ export function TransferFunds() {
const [amount, setAmount] = useState<number | null>(null);
const [amountInput, setAmountInput] = useState<string>("");
const [isLoading, setIsLoading] = useState(false);
const [explorerLink, setExplorerLink] = useState<string | null>(null);
const isStaging = process.env.NEXT_PUBLIC_CROSSMINT_API_KEY?.includes("staging");

async function handleOnTransfer() {
if (wallet == null || recipient == null || amount == null) {
alert("Transfer: missing required fields");
return;
}

if (recipient === wallet.address) {
alert("You cannot send funds to your own wallet.");
return;
}

try {
setIsLoading(true);
const txn = await wallet.send(recipient, "usdxm", amount.toString());
setExplorerLink(txn.explorerLink);
await wallet.send(recipient, "usdxm", amount.toString());
setRecipient(null);
setAmount(null);
setAmountInput("");
} catch (err) {
console.error("Transfer: ", err);
if (err instanceof Error && err.name === "AuthRejectedError") {
Expand All @@ -38,7 +45,20 @@ export function TransferFunds() {
<div className="bg-white rounded-2xl border shadow-sm p-6">
<div className="flex flex-col gap-4">
<div>
<h3 className="text-lg font-semibold mb-1">Transfer funds</h3>
<div className="flex items-center gap-2 mb-1">
<h3 className="text-lg font-semibold">Transfer funds</h3>
{isStaging && (
<div className="relative group">
<div className="w-5 h-5 rounded-full border border-gray-300 flex items-center justify-center cursor-help">
<span className="text-gray-500 text-xs font-medium">i</span>
</div>
<div className="absolute bottom-full left-1/2 transform -translate-x-1/2 mb-2 px-3 py-2 bg-gray-900 text-white text-xs rounded-md w-56 opacity-0 group-hover:opacity-100 transition-opacity duration-200 pointer-events-none">
This environment uses devnet blockchain. To complete a transfer, the recipient must have a devnet wallet.
<div className="absolute top-full left-1/2 transform -translate-x-1/2 w-0 h-0 border-l-4 border-r-4 border-t-4 border-transparent border-t-gray-900"></div>
</div>
</div>
)}
</div>
<p className="text-sm text-gray-500">Send funds to another wallet</p>
</div>

Expand Down Expand Up @@ -88,7 +108,7 @@ export function TransferFunds() {
/>
</div>

{/* Transfer Button */}
{/* Transfer Button */}
<button
className={cn(
"w-full py-3 px-4 rounded-full text-sm font-medium transition-colors",
Expand All @@ -102,17 +122,6 @@ export function TransferFunds() {
{isLoading ? "Transferring..." : "Transfer"}
</button>

{/* Explorer Link */}
{explorerLink && !isLoading && (
<a
href={explorerLink}
className="text-sm text-blue-600 hover:text-blue-800 text-center transition-colors"
target="_blank"
rel="noopener noreferrer"
>
→ View transaction
</a>
)}
</div>
</div>
);
Expand Down