Skip to content
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

Jump to bottom

Release bugs fix part 3 #360

Merged
merged 10 commits into from
Aug 23, 2024
Merged

Release bugs fix part 3 #360

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e028a6a
fix: cv chart border-radius and remove "Min. conviction" from signali…
Mati0x Aug 20, 2024
baffd6a
feat:
Mati0x Aug 20, 2024
5dab4b6
feat: apply new styles to `PoolGovernance` component
Mati0x Aug 20, 2024
953f828
feat: add threshold call from contract + icon for docs link in navbar
Mati0x Aug 21, 2024
78c4e62
feat: try new conviction value contract function call
Mati0x Aug 21, 2024
db97a33
fix useConvictionRead hook
Mati0x Aug 22, 2024
2038f6b
fix: new conviction function call in useConvictionRead + add blockLas…
Mati0x Aug 22, 2024
6adc913
fix undefined in proposalId page
Mati0x Aug 22, 2024
5e1515e
fix: roll back to updateConvictin function + update `Disclaimer` content
Mati0x Aug 22, 2024
8e63404
Merge branch 'dev' into release-bugs-fix-part-3
Corantin Aug 22, 2024
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
10 changes: 5 additions & 5 deletions apps/web/components/Charts/ConvictionBarChart.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,10 @@ export const ConvictionBarChart = ({
},
animation: true,
barGap: "-100%",
showBackground: true,
backgroundStyle: {
color: "#D5D5D5",
},
series: [
{
type: "bar",
Expand All @@ -261,11 +265,7 @@ export const ConvictionBarChart = ({
color: "#A8E066",
borderRadius: borderRadius,
},
showBackground: true,
backgroundStyle: {
color: "#D5D5D5",
borderRadius: borderRadius,
},

label: {
show: !compact ?? false,
position: "insideRight",
Expand Down
35 changes: 1 addition & 34 deletions apps/web/components/ConnectWalletButton.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@

import React, { Fragment } from "react";
import { Menu, Transition } from "@headlessui/react";
import {
ChevronUpIcon,
PowerIcon,
ArrowTopRightOnSquareIcon,
} from "@heroicons/react/24/solid";
import { ChevronUpIcon, PowerIcon } from "@heroicons/react/24/solid";
import { ConnectButton } from "@rainbow-me/rainbowkit";
import cn from "classnames";
import Image from "next/image";
Expand Down Expand Up @@ -193,35 +189,6 @@ export function ConnectWallet() {
Disconnect
</Button>
</Menu.Item>
<div className="flex gap-2 items-center justify-end border-t-[1px] border-neutral-soft pt-4">
<a
href="/"
target="_blank"
rel="noreferrer"
className="text-primary-content subtitle2 flex items-center gap-1"
>
Home
<ArrowTopRightOnSquareIcon
width={16}
height={16}
className="text-primary-content"
/>
</a>
<div className="text-neutral-soft">|</div>
<a
href="https://docs.gardens.fund"
target="_blank"
rel="noreferrer"
className="text-primary-content subtitle2 flex items-center gap-1"
>
Docs
<ArrowTopRightOnSquareIcon
width={16}
height={16}
className="text-primary-content"
/>
</a>
</div>
</div>
</Menu.Items>
</Transition>
Expand Down
43 changes: 19 additions & 24 deletions apps/web/components/NavBar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@

import React from "react";
import { Disclosure } from "@headlessui/react";
import { Bars3Icon, XMarkIcon } from "@heroicons/react/24/outline";
import {
BookOpenIcon,
Bars3Icon,
XMarkIcon,
} from "@heroicons/react/24/outline";
import Image from "next/image";
import Link from "next/link";
import { newLogo } from "@/assets";
Expand Down Expand Up @@ -38,19 +42,21 @@ export function NavBar() {
pre-beta release{" "}
</p>
</div>
<div className="hidden sm:ml-4 sm:flex sm:space-x-8">
{/* {navItems.map(({ name, href }) => (
<Link
key={href}
href={href}
className="inline-flex items-center border-b-2 border-transparent px-1 pt-1 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700"
>
{name}
</Link>
))} */}
</div>
</div>
<div className="hidden sm:ml-6 sm:flex sm:items-center">
<div className="hidden sm:ml-6 sm:flex sm:items-center gap-4">
<a
href="https://docs.gardens.fund"
target="_blank"
rel="noreferrer"
className="text-primary-content subtitle2 flex items-center gap-1 hover:opacity-90"
>
<BookOpenIcon
width={16}
height={16}
className="text-primary-content"
/>
Docs
</a>
<ConnectWallet />
</div>
<div className="-mr-2 flex items-center sm:hidden">
Expand All @@ -71,7 +77,6 @@ export function NavBar() {
</div>
</div>
</div>

<Disclosure.Panel className="sm:hidden">
<div className="space-y-1 pb-3 pt-2">
{navItems.map(({ name, href }) => (
Expand All @@ -84,16 +89,6 @@ export function NavBar() {
</Link>
))}
</div>
<div className="flex border-t border-gray-200 p-4">
{/* <ConnectButton /> */}
{/* <Button
disabled={connecting}
onClick={() => (wallet ? disconnect(wallet) : connect())}
className="bg-primary"
>
{connecting ? "Connecting" : wallet ? "Disconnect" : "Connect"}
</Button> */}
</div>
</Disclosure.Panel>
</>
)}
Expand Down
25 changes: 11 additions & 14 deletions apps/web/components/PoolGovernance.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export const PoolGovernance: React.FC<PoolGovernanceProps> = ({
{address && (
<div className="mt-4 flex flex-col justify-between items-start">
<div className="flex flex-1 gap-10">
<div className="flex flex-col items-start gap-4">
<div className="flex flex-col items-start gap-2">
<div className="flex items-center gap-6">
<p className="subtitle2">Your stake in the community:</p>
<DisplayNumber
Expand All @@ -76,22 +76,19 @@ export const PoolGovernance: React.FC<PoolGovernanceProps> = ({
<Badge status={memberActivatedStrategy ? 1 : 0} />
</div>
{showPoolGovernanceData && (
<div className="flex gap-6">
<div className="flex flex-col items-start gap-1">
<p className="subtitle2">Your governance weight:</p>
<h2 className="text-primary-content">
{memberPoolWeight.toFixed(2)} %
</h2>
</div>

<InfoBox
content={poolSystemDefinition[poolSystem]}
infoBoxType="info"
classNames="flex-1 w-full"
/>
<div className="flex items-start gap-6">
<p className="subtitle2">Your governance weight:</p>
<p className="subtitle2 text-primary-content">
{memberPoolWeight.toFixed(2)} %
</p>
</div>
)}
</div>
<InfoBox
content={poolSystemDefinition[poolSystem]}
infoBoxType="info"
classNames="flex-1 w-full"
/>
</div>
</div>
)}
Expand Down
5 changes: 4 additions & 1 deletion apps/web/components/PoolHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,10 @@ export default function PoolHeader({
const filteredPoolConfig =
PoolTypes[proposalType] === "signaling" ?
poolConfig.filter(
(config) => !["Spending limit", "Min Threshold"].includes(config.label),
(config) =>
!["Spending limit", "Min Threshold", "Min conviction"].includes(
config.label,
),
)
: poolConfig;

Expand Down
Loading