From 3bf26050c79612236006a8e04f8982070c62ec3f Mon Sep 17 00:00:00 2001 From: Matias Date: Fri, 6 Dec 2024 15:35:14 -0300 Subject: [PATCH 1/6] fix buttons disable state in pool page --- apps/web/components/Proposals.tsx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/apps/web/components/Proposals.tsx b/apps/web/components/Proposals.tsx index 95bbedc27..7dc5a20a4 100644 --- a/apps/web/components/Proposals.tsx +++ b/apps/web/components/Proposals.tsx @@ -472,7 +472,7 @@ export function Proposals({ } onClick={() => setAllocationView((prev) => !prev)} - disabled={disableManSupportButton || !isAllowed} + disabled={!isConnected || missmatchUrl || !isAllowed} tooltip={tooltipMessage} > Manage support @@ -582,13 +582,7 @@ export function Proposals({ From 6aef39036de9b8a3438e4844d4d18bb66e6ed5cd Mon Sep 17 00:00:00 2001 From: Matias Date: Fri, 6 Dec 2024 16:06:04 -0300 Subject: [PATCH 2/6] fix slider in `ProposalCard` --- apps/web/components/ProposalCard.tsx | 42 +++++++++++----------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/apps/web/components/ProposalCard.tsx b/apps/web/components/ProposalCard.tsx index 5c62c0495..bd83e9ba5 100644 --- a/apps/web/components/ProposalCard.tsx +++ b/apps/web/components/ProposalCard.tsx @@ -205,33 +205,25 @@ export function ProposalCard({
{isAllocationView ? -
+
-
- { - inputHandler( - proposalData.id, - BigInt(Math.floor(Number(e.target.value))), - ); - }} - disabled={isProposalEnded} - /> -
+ { + inputHandler( + proposalData.id, + BigInt(Math.floor(Number(e.target.value))), + ); + }} + disabled={isProposalEnded} + /> +
{[...Array(21)].map((_, i) => ( // eslint-disable-next-line react/no-array-index-key From 6d89d21d32f8261bdeae3539464763af6e1da1fc Mon Sep 17 00:00:00 2001 From: Matias Date: Fri, 6 Dec 2024 16:28:14 -0300 Subject: [PATCH 3/6] fix minimun conviction input in `PoolForm` to allow 0 value --- apps/web/components/Forms/PoolForm.tsx | 6 ------ 1 file changed, 6 deletions(-) diff --git a/apps/web/components/Forms/PoolForm.tsx b/apps/web/components/Forms/PoolForm.tsx index 386365256..1c400e91a 100644 --- a/apps/web/components/Forms/PoolForm.tsx +++ b/apps/web/components/Forms/PoolForm.tsx @@ -931,7 +931,6 @@ export function PoolForm({ token, communityAddr }: Props) { tooltip="% of Pool's voting weight needed to pass the smallest funding proposal possible. Higher funding requests demand greater conviction to pass." label="Minimum conviction" register={register} - required errors={errors} registerKey="minimumConviction" type="number" @@ -940,17 +939,12 @@ export function PoolForm({ token, communityAddr }: Props) { className="pr-14" otherProps={{ step: 1 / CV_SCALE_PRECISION, - min: 1 / CV_SCALE_PRECISION, }} registerOptions={{ max: { value: 99.9, message: "Minimum conviction should be under 100%", }, - min: { - value: 1 / CV_SCALE_PRECISION, - message: "Minimum conviction must be greater than 0", - }, }} suffix="%" /> From f5fe1e611ff6b5a891124007c715b845168793b5 Mon Sep 17 00:00:00 2001 From: Matias Date: Sat, 7 Dec 2024 13:57:22 -0300 Subject: [PATCH 4/6] fix manage support button disable state --- apps/web/components/Proposals.tsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/apps/web/components/Proposals.tsx b/apps/web/components/Proposals.tsx index 8827eb85f..4d57995db 100644 --- a/apps/web/components/Proposals.tsx +++ b/apps/web/components/Proposals.tsx @@ -246,7 +246,7 @@ export function Proposals({ const disableManageSupportBtnCondition: ConditionObject[] = [ { condition: !memberActivatedStrategy, - message: "Must have points activated to support proposals", + message: "You need to activate your governance first", }, { condition: !isAllowed, @@ -446,6 +446,7 @@ export function Proposals({ const isEndedProposalActiveAllocation = endedProposals.some( (x) => stakedFilters[x.id]?.value, ); + // Render return ( <> @@ -472,7 +473,12 @@ export function Proposals({ } onClick={() => setAllocationView((prev) => !prev)} - disabled={!isConnected || missmatchUrl || !isAllowed} + disabled={ + !isConnected || + missmatchUrl || + !memberActivatedStrategy || + !isAllowed + } tooltip={tooltipMessage} > Manage support From 1caf5acfa24196d40d7659668b1a4350504b7d9e Mon Sep 17 00:00:00 2001 From: Matias Date: Tue, 10 Dec 2024 14:58:09 -0300 Subject: [PATCH 5/6] feat: add tooltip for ended proposals --- apps/web/components/ProposalCard.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/web/components/ProposalCard.tsx b/apps/web/components/ProposalCard.tsx index c9ce5a230..baa278b9b 100644 --- a/apps/web/components/ProposalCard.tsx +++ b/apps/web/components/ProposalCard.tsx @@ -207,7 +207,10 @@ export function ProposalCard({ {isAllocationView ?
-
+
Date: Wed, 11 Dec 2024 14:00:57 -0300 Subject: [PATCH 6/6] fix safePrefix for council safe inks --- apps/web/configs/chains.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/web/configs/chains.tsx b/apps/web/configs/chains.tsx index 542385a89..9b043ec91 100644 --- a/apps/web/configs/chains.tsx +++ b/apps/web/configs/chains.tsx @@ -154,7 +154,7 @@ export const chainConfigMap: { arbitrator: "0x10B469b23a47BC557daB81743af8A97Ef9e9f833", passportScorer: "0x8cd4bA4ad10d85A550fe45d567a49E49e1D23CE1", isTestnet: false, - safePrefix: "arb", + safePrefix: "arb1", }, 10: { name: optimism.name, @@ -173,7 +173,7 @@ export const chainConfigMap: { arbitrator: "0x01b415E97310611EF5fea5c0b43470F6217456aA", passportScorer: "0x084a5504dCFeac0ec3E10517247639e50c8DcFFd", isTestnet: false, - safePrefix: "opt", + safePrefix: "oeth", }, 137: { name: polygon.name,