savepoint

sushi-labs · Feb 7, 2025 · e781b0a · e781b0a
1 parent 9052dba
commit e781b0a
Show file tree

Hide file tree

Showing 21 changed files with 714 additions and 270 deletions.
diff --git a/apps/web/src/app/(networks)/(non-evm)/aptos/pool/ui/tables/pools/columns.tsx b/apps/web/src/app/(networks)/(non-evm)/aptos/pool/ui/tables/pools/columns.tsx
@@ -9,17 +9,19 @@ export const NAME_COLUMN: ColumnDef<TopPool, unknown> = {
   header: 'Name',
   cell: (props) => <PoolNameCell row={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex items-center">
-          <SkeletonCircle radius={30} />
-          <SkeletonCircle radius={30} className="-ml-[10px]" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex items-center">
+            <SkeletonCircle radius={30} />
+            <SkeletonCircle radius={30} className="-ml-[10px]" />
+          </div>
+          <div className="flex flex-col w-full min-w-[120px]">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-        <div className="flex flex-col w-full min-w-[120px]">
-          <SkeletonText fontSize="lg" />
-        </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -34,7 +36,9 @@ export const TVL_COLUMN: ColumnDef<TopPool, unknown> = {
       ? '$0.00'
       : formatUSD(props.row.original.liquidityUSD),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -49,7 +53,9 @@ export const VOLUME_1D_COLUMN: ColumnDef<TopPool, unknown> = {
       ? '$0.00'
       : formatUSD(props.row.original.volumeUSD1d),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -64,7 +70,9 @@ export const FEES_1D_COLUMN: ColumnDef<TopPool, unknown> = {
       ? '$0.00'
       : formatUSD(props.row.original.feeUSD1d),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -76,7 +84,9 @@ export const TRANSACTIONS_1D_COLUMN: ColumnDef<TopPool, unknown> = {
     rowA.txCount1d - rowB.txCount1d,
   cell: (props) => props.row.original.txCount1d,
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -86,6 +96,8 @@ export const APR_COLUMN: ColumnDef<TopPool, unknown> = {
   accessorFn: (row) => row.totalApr1d,
   cell: (props) => formatPercent(props.row.original.totalApr1d),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
diff --git a/apps/web/src/app/(networks)/(non-evm)/aptos/pool/ui/tables/positions/columns.tsx b/apps/web/src/app/(networks)/(non-evm)/aptos/pool/ui/tables/positions/columns.tsx
@@ -10,17 +10,19 @@ export const NAME_COLUMN: ColumnDef<PoolExtendedWithAprVolume, unknown> = {
   header: 'Name',
   cell: (props) => <PositionNameCell row={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex items-center">
-          <SkeletonCircle radius={26} />
-          <SkeletonCircle radius={26} className="-ml-[12px]" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex items-center">
+            <SkeletonCircle radius={26} />
+            <SkeletonCircle radius={26} className="-ml-[12px]" />
+          </div>
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
-        </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -32,13 +34,15 @@ export const TVL_COLUMN: ColumnDef<PoolExtendedWithAprVolume, unknown> = {
     <PoolMyPositionTVLCell isSize={false} row={props.row.original} />
   ),
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -52,13 +56,15 @@ export const MYPOSITION_TVL_COLUMN: ColumnDef<
     <PoolMyPositionTVLCell isSize={true} row={props.row.original} />
   ),
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -70,12 +76,14 @@ export const MYPOSITION_APR_COLUMN: ColumnDef<
   header: 'APR',
   cell: (props) => <PoolMyPositionAprCell row={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
diff --git a/apps/web/src/app/(networks)/(non-evm)/tron/_common/ui/Pools/PoolsTable/PoolColumns.tsx b/apps/web/src/app/(networks)/(non-evm)/tron/_common/ui/Pools/PoolsTable/PoolColumns.tsx
@@ -9,17 +9,19 @@ export const NAME_COLUMN: ColumnDef<TopPool, unknown> = {
   header: 'Name',
   cell: (props) => <PoolNameCell data={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex items-center">
-          <SkeletonCircle radius={30} />
-          <SkeletonCircle radius={30} className="-ml-[10px]" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex items-center">
+            <SkeletonCircle radius={30} />
+            <SkeletonCircle radius={30} className="-ml-[10px]" />
+          </div>
+          <div className="flex flex-col w-full min-w-[120px]">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-        <div className="flex flex-col w-full min-w-[120px]">
-          <SkeletonText fontSize="lg" />
-        </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -34,7 +36,9 @@ export const TVL_COLUMN: ColumnDef<TopPool, unknown> = {
       ? '$0.00'
       : formatUSD(props.row.original.liquidityUSD),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -49,7 +53,9 @@ export const VOLUME_1D_COLUMN: ColumnDef<TopPool, unknown> = {
       ? '$0.00'
       : formatUSD(props.row.original.volumeUSD1d),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -64,7 +70,9 @@ export const FEES_1D_COLUMN: ColumnDef<TopPool, unknown> = {
       ? '$0.00'
       : formatUSD(props.row.original.feeUSD1d),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -76,7 +84,9 @@ export const TRANSACTIONS_1D_COLUMN: ColumnDef<TopPool, unknown> = {
     rowA.txCount1d - rowB.txCount1d,
   cell: (props) => props.row.original.txCount1d,
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
 
@@ -86,6 +96,8 @@ export const APR_COLUMN: ColumnDef<TopPool, unknown> = {
   accessorFn: (row) => row.totalApr1d,
   cell: (props) => formatPercent(props.row.original.totalApr1d),
   meta: {
-    skeleton: <SkeletonText fontSize="lg" />,
+    body: {
+      skeleton: <SkeletonText fontSize="lg" />,
+    },
   },
 }
diff --git a/...web/src/app/(networks)/(non-evm)/tron/_common/ui/Pools/PositionsTable/PositionColumns.tsx b/...web/src/app/(networks)/(non-evm)/tron/_common/ui/Pools/PositionsTable/PositionColumns.tsx
@@ -12,17 +12,19 @@ export const POSITION_NAME_COLUMN: ColumnDef<IPositionRowData, unknown> = {
   header: 'Name',
   cell: (props) => <PositionNameCell data={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex items-center">
-          <SkeletonCircle radius={ICON_SIZE} />
-          <SkeletonCircle radius={ICON_SIZE} className="-ml-[12px]" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex items-center">
+            <SkeletonCircle radius={ICON_SIZE} />
+            <SkeletonCircle radius={ICON_SIZE} className="-ml-[12px]" />
+          </div>
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
-        </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -31,13 +33,15 @@ export const VALUE_COLUMN: ColumnDef<IPositionRowData, unknown> = {
   header: 'Value',
   cell: (props) => <PositionValueCell data={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 
@@ -46,26 +50,30 @@ export const SIZE_COLUMN: ColumnDef<IPositionRowData, unknown> = {
   header: 'Size',
   cell: (props) => <PositionSizeCell data={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
 export const APR_COLUMN: ColumnDef<IPositionRowData, unknown> = {
   id: 'apr',
   header: 'APR',
   cell: (props) => <PositionAprCell data={props.row.original} />,
   meta: {
-    skeleton: (
-      <div className="flex items-center w-full gap-2">
-        <div className="flex flex-col w-full">
-          <SkeletonText fontSize="lg" />
+    body: {
+      skeleton: (
+        <div className="flex items-center w-full gap-2">
+          <div className="flex flex-col w-full">
+            <SkeletonText fontSize="lg" />
+          </div>
         </div>
-      </div>
-    ),
+      ),
+    },
   },
 }
diff --git a/...thenticated)/dashboard/[teamId]/settings/team/_common/ui/delete-team/delete-team-card.tsx b/...thenticated)/dashboard/[teamId]/settings/team/_common/ui/delete-team/delete-team-card.tsx
@@ -0,0 +1,35 @@
+import {
+  Button,
+  Card,
+  CardContent,
+  CardDescription,
+  CardHeader,
+  CardTitle,
+} from '@sushiswap/ui'
+import { DeleteTeamModal } from './delete-team-modal'
+// import { DeleteAccountModal } from './delete-account-modal'
+
+interface DeleteTeamCard {
+  teamId: string
+}
+
+export async function DeleteTeamCard({ teamId }: DeleteTeamCard) {
+  // Permission-based
+  const canDelete = true
+
+  return (
+    <Card className="w-full min-w-[470px]">
+      <CardHeader className="bg-secondary rounded-t-xl">
+        <CardTitle>Delete Team</CardTitle>
+        <CardDescription>Permanently delete the team</CardDescription>
+      </CardHeader>
+      <CardContent className="bg-secondary rounded-b-xl">
+        <DeleteTeamModal teamId={teamId}>
+          <Button variant="destructive" fullWidth disabled={!canDelete}>
+            Delete
+          </Button>
+        </DeleteTeamModal>
+      </CardContent>
+    </Card>
+  )
+}