Skip to content
Open
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
18 changes: 9 additions & 9 deletions apps/frontend/src/app/checkout/page.tsx
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
'use client';

import { useState, useEffect } from 'react';
import { motion, AnimatePresence } from 'motion/react';
import { QRCodeSVG } from 'qrcode.react';
import {
CreditCard,
Building2,
Coins,
Copy,
Check,
CheckCircle2,
Shield,
ChevronDown,
Clock,
Coins,
Copy,
CreditCard,
ExternalLink,
ChevronDown,
Loader2,
Lock,
Check,
Shield,
} from 'lucide-react';
import { AnimatePresence, motion } from 'motion/react';
import { QRCodeSVG } from 'qrcode.react';
import { useEffect, useState } from 'react';
import { Button } from '../components/ui/button';

type PaymentMethod = 'card' | 'bank' | 'crypto';
Expand Down
28 changes: 22 additions & 6 deletions apps/frontend/src/app/dashboard/page.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,25 @@
'use client';

<<<<<<< HEAD
import { motion } from 'motion/react';
=======
>>>>>>> fff37a6 (fix: resolve linting and build errors)
import {
TrendingUp,
TrendingDown,
ArrowUpRight,
Activity,
DollarSign,
Clock,
CheckCircle2,
AlertCircle,
<<<<<<< HEAD
} from 'lucide-react';
=======
ArrowUpRight,
CheckCircle2,
Clock,
DollarSign,
TrendingDown,
TrendingUp,
} from 'lucide-react';
import { motion } from 'motion/react';
import { useMemo } from 'react';
>>>>>>> fff37a6 (fix: resolve linting and build errors)

const stats = [
{
Expand Down Expand Up @@ -98,6 +107,9 @@ const transactions = [
];

export default function OverviewPage() {
// Generate random widths for each asset once
const assetWidths = assets.map(() => useMemo(() => `${Math.random() * 40 + 60}%`, []));

return (
<div className="p-4 sm:p-6 lg:p-8">
{/* Header */}
Expand Down Expand Up @@ -211,7 +223,11 @@ export default function OverviewPage() {
<motion.div
className="h-full bg-gradient-to-r from-white/30 to-white/10"
initial={{ width: 0 }}
<<<<<<< HEAD
animate={{ width: `${[85, 72, 64][index % 3]}%` }}
=======
animate={{ width: assetWidths[index] }}
>>>>>>> fff37a6 (fix: resolve linting and build errors)
transition={{ duration: 1, delay: 0.5 + index * 0.1 }}
/>
</div>
Expand Down
5 changes: 5 additions & 0 deletions apps/frontend/src/app/dashboard/subscriptions/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
'use client';

<<<<<<< HEAD
import { motion } from 'motion/react';
import { Plus, CheckCircle2, AlertCircle } from 'lucide-react';
=======
import { AlertCircle, CheckCircle2, Plus } from 'lucide-react';
import { motion } from 'motion/react';
>>>>>>> fff37a6 (fix: resolve linting and build errors)

const subscriptions = [
{
Expand Down
5 changes: 5 additions & 0 deletions apps/frontend/src/app/dashboard/treasury/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
'use client';

<<<<<<< HEAD
import { motion } from 'motion/react';
import { Coins, TrendingUp, Eye, CheckCircle2 } from 'lucide-react';
=======
import { CheckCircle2, Coins, Eye, TrendingUp } from 'lucide-react';
import { motion } from 'motion/react';
>>>>>>> fff37a6 (fix: resolve linting and build errors)

const mirrorAssets = [
{
Expand Down
5 changes: 5 additions & 0 deletions apps/frontend/src/app/dashboard/webhooks/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
'use client';

<<<<<<< HEAD
import { motion } from 'motion/react';
import { Plus, AlertCircle, Activity } from 'lucide-react';
=======
import { Activity, AlertCircle, Plus } from 'lucide-react';
import { motion } from 'motion/react';
>>>>>>> fff37a6 (fix: resolve linting and build errors)

const webhooks = [
{
Expand Down
Loading