Skip to content

Commit

Permalink
Merge branch 'berachain'
Browse files Browse the repository at this point in the history
  • Loading branch information
lilchizh committed Mar 4, 2024
2 parents e111e1e + 79836eb commit 2f5f8a8
Show file tree
Hide file tree
Showing 33 changed files with 165 additions and 1,748 deletions.
686 changes: 0 additions & 686 deletions src/abis/plugins/algebraLimitOrderPlugin.ts

This file was deleted.

1 change: 0 additions & 1 deletion src/abis/plugins/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export * from './algebraLimitOrderPlugin';
export * from './algebraBasePlugin';
6 changes: 0 additions & 6 deletions src/components/common/Navigation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { NavLink, matchPath, useLocation } from "react-router-dom";

const PATHS = {
SWAP: '/swap',
LIMIT_ORDERS: 'limit-order',
POOLS: '/pools'
}

Expand All @@ -12,11 +11,6 @@ const menuItems = [
link: '/swap',
active: [PATHS.SWAP]
},
{
title: 'Limit Order',
link: '/limit-order',
active: [PATHS.LIMIT_ORDERS]
},
{
title: 'Pools',
link: '/pools',
Expand Down
20 changes: 1 addition & 19 deletions src/components/common/PluginIcons/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { HoverCard, HoverCardContent, HoverCardTrigger } from "@/components/ui/hover-card"
import { TrendingUpIcon, ZapIcon } from "lucide-react"
import { ZapIcon } from "lucide-react"

export const DynamicFeePluginIcon = () => <HoverCard>
<HoverCardTrigger>
Expand All @@ -17,22 +17,4 @@ export const DynamicFeePluginIcon = () => <HoverCard>
Learn more →
</a>
</HoverCardContent>
</HoverCard>

export const LimitOrderPluginIcon = () => <HoverCard>
<HoverCardTrigger>
<div className="text-sm h-fit p-2">
<TrendingUpIcon size={16} stroke={'#29ff69'} />
</div>
</HoverCardTrigger>
<HoverCardContent className="flex flex-col gap-2 bg-card rounded-3xl border border-card-border text-white w-fit">
<div className="flex items-center">
<LimitOrderPluginIcon />
<span className="font-bold">Limit Orders</span>
</div>
<div className="text-left">This pool uses <b>Limit Orders</b> plugin</div>
<a className="w-fit text-left text-cyan-300 hover:underline" href={'https://cryptoalgebra.gitbook.io/algebra-integral/core-logic/plugins'} target={'_blank'}>
Learn more →
</a>
</HoverCardContent>
</HoverCard>
175 changes: 0 additions & 175 deletions src/components/common/Table/limitOrderColumns.tsx

This file was deleted.

5 changes: 2 additions & 3 deletions src/components/common/Table/poolsColumns.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Address } from "wagmi";
import { useCurrency } from "@/hooks/common/useCurrency";
import CurrencyLogo from "../CurrencyLogo";
import { TokenFieldsFragment } from "@/graphql/generated/graphql";
import { DynamicFeePluginIcon, LimitOrderPluginIcon } from "../PluginIcons";
import { DynamicFeePluginIcon } from "../PluginIcons";
import { formatUSD } from "@/utils/common/formatUSD";
import { usePoolPlugins } from "@/hooks/pools/usePoolPlugins";
import { Skeleton } from "@/components/ui/skeleton";
Expand Down Expand Up @@ -45,11 +45,10 @@ const PoolPair = ({ pair, fee }: Pool) => {

const Plugins = ({ poolId }: { poolId: Address }) => {

const { limitOrderPlugin, dynamicFeePlugin } = usePoolPlugins(poolId)
const { dynamicFeePlugin } = usePoolPlugins(poolId)

return <div className="flex gap-2">
{dynamicFeePlugin && <DynamicFeePluginIcon />}
{limitOrderPlugin && <LimitOrderPluginIcon />}
</div>
}

Expand Down
Loading

0 comments on commit 2f5f8a8

Please sign in to comment.