Skip to content

Commit d230394

Browse files
authored
Navbar Cleanup (#1206)
* updates connect button * version picker added * version picker cleanup * cleanup * updates per comments
1 parent 4fdd41e commit d230394

File tree

4 files changed

+57
-18
lines changed

4 files changed

+57
-18
lines changed

apps/hyperdrive-trading/src/ui/app/Navbar/DevtoolsMenu.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ export function DevtoolsMenu(): ReactElement {
1919
<FeatureFlagMenuItem flagName="bridge">
2020
Bridge Assets
2121
</FeatureFlagMenuItem>
22+
<FeatureFlagMenuItem flagName="version-picker">
23+
Show Version Picker
24+
</FeatureFlagMenuItem>
2225
<MenuItem
2326
onClick={() => {
2427
throw new Error(
@@ -57,7 +60,6 @@ function FeatureFlagMenuItem({
5760
</li>
5861
);
5962
}
60-
6163
function MenuItem({ onClick, title }: { onClick?: () => void; title: string }) {
6264
return (
6365
<li>

apps/hyperdrive-trading/src/ui/app/Navbar/Navbar.tsx

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,12 @@ import { ReactElement } from "react";
77
import { DevtoolsMenu } from "src/ui/app/Navbar/DevtoolsMenu";
88
import { HyperdriveLogo } from "src/ui/app/Navbar/HyperdriveLogo";
99
import { ConnectWalletButton } from "src/ui/base/components/ConnectWallet";
10+
import VersionPicker from "src/ui/base/components/VersionPicker";
11+
import { useFeatureFlag } from "src/ui/base/featureFlags/featureFlags";
1012
import { useIsTailwindSmallScreen } from "src/ui/base/mediaBreakpoints";
1113
export function Navbar(): ReactElement {
1214
const isTailwindSmallScreen = useIsTailwindSmallScreen();
15+
const { isFlagEnabled: showVersionPicker } = useFeatureFlag("version-picker");
1316
return (
1417
<div className="daisy-navbar">
1518
<div className="daisy-navbar-start ml-2">
@@ -33,19 +36,24 @@ export function Navbar(): ReactElement {
3336
</span>
3437
<ArrowTopRightOnSquareIcon className="-mt-0.5 inline h-4" />
3538
</a>
36-
<a
37-
target="_blank"
38-
rel="noreferrer"
39-
href="https://warpcast.com/~/compose?text=Can%20you%20outtrade%20me%20on%20Hyperdrive%3F%20Warp%20your%20best%20Hyperdrive%20trade%20screenshot%20below%20%F0%9F%93%88%20%2Fdelv&embeds[]=https://frames.hyperdrive.trade"
40-
className="text-white daisy-btn rounded-full"
41-
>
42-
<span className="hidden sm:inline">Cast on Warpcast</span>
43-
<span className="inline sm:hidden">Cast</span>
44-
<img
45-
className="h-4"
46-
src="https://raw.githubusercontent.com/vrypan/farcaster-brand/ea95543f6d1308dd52631f5e81f395a60447df0b/icons/icon-transparent/transparent-white.svg"
47-
/>
48-
</a>
39+
{showVersionPicker ? (
40+
<VersionPicker />
41+
) : (
42+
<a
43+
target="_blank"
44+
rel="noreferrer"
45+
href="https://warpcast.com/~/compose?text=Can%20you%20outtrade%20me%20on%20Hyperdrive%3F%20Warp%20your%20best%20Hyperdrive%20trade%20screenshot%20below%20%F0%9F%93%88%20%2Fdelv&embeds[]=https://frames.hyperdrive.trade"
46+
className="text-white daisy-btn rounded-full"
47+
>
48+
<span className="hidden sm:inline">Cast on Warpcast</span>
49+
<span className="inline sm:hidden">Cast</span>
50+
<img
51+
className="h-4"
52+
src="https://raw.githubusercontent.com/vrypan/farcaster-brand/ea95543f6d1308dd52631f5e81f395a60447df0b/icons/icon-transparent/transparent-white.svg"
53+
/>
54+
</a>
55+
)}
56+
4957
{import.meta.env.DEV && !isTailwindSmallScreen ? (
5058
<DevtoolsMenu />
5159
) : null}

apps/hyperdrive-trading/src/ui/base/components/ConnectWallet.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ export function ConnectWalletButton(): JSX.Element {
4040
);
4141
}
4242
return (
43-
<div className="flex items-center gap-4">
43+
<div className="daisy-join flex items-center rounded-full">
4444
<button
45+
className="daisy-btn daisy-btn-circle daisy-join-item flex size-12 bg-base-300"
4546
onClick={openChainModal}
46-
className="daisy-btn rounded-full"
4747
>
48-
{chain.name}
48+
<img className="w-6 hover:scale-105" src={chain.iconUrl} />
4949
</button>
5050
<button
51-
className="daisy-btn daisy-btn-circle daisy-btn-primary mx-0 w-24 md:w-32"
51+
className="daisy-btn daisy-btn-circle daisy-join-item mx-0 w-24 md:w-32"
5252
onClick={openAccountModal}
5353
>
5454
{account.displayName}
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
import { ChevronDownIcon } from "@heroicons/react/24/outline";
2+
3+
export default function VersionPicker(): JSX.Element {
4+
return (
5+
<div className="daisy-dropdown">
6+
<div
7+
tabIndex={0}
8+
className="daisy-btn flex items-center justify-center rounded-full"
9+
>
10+
Latest Version
11+
<ChevronDownIcon className="hidden h-4 sm:inline" />
12+
</div>
13+
<ul
14+
tabIndex={0}
15+
className="daisy-menu daisy-dropdown-content z-[1] w-auto gap-2 rounded-lg bg-base-100 p-4 shadow"
16+
>
17+
<li>
18+
<a
19+
rel="noreferrer"
20+
target="_blank"
21+
href="https://testnet-v1.hyperdrive.box/"
22+
>
23+
V1 Pools
24+
</a>
25+
</li>
26+
</ul>
27+
</div>
28+
);
29+
}

0 commit comments

Comments
 (0)