From 94e5025d25ff932e393b7d705a1ce417abb8e6a2 Mon Sep 17 00:00:00 2001 From: Kellar Date: Fri, 6 Dec 2024 11:30:16 +0000 Subject: [PATCH 1/6] copy updates --- src/components/ui/cards/DAONodeInfoCard.tsx | 2 ++ src/i18n/locales/en/daoCreate.json | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/components/ui/cards/DAONodeInfoCard.tsx b/src/components/ui/cards/DAONodeInfoCard.tsx index 084278088..508add2b9 100644 --- a/src/components/ui/cards/DAONodeInfoCard.tsx +++ b/src/components/ui/cards/DAONodeInfoCard.tsx @@ -94,6 +94,8 @@ export function DAONodeInfoCard(props: { color="lilac-0" whiteSpace="nowrap" > + {/* Convert multisig badge casing here since it's already been cached to avoid another migration */} + {type === 'MULTISIG' ? `${type[0]}${type.slice(1).toLocaleLowerCase()}` : type} {type} diff --git a/src/i18n/locales/en/daoCreate.json b/src/i18n/locales/en/daoCreate.json index 3fd63b839..966194ebb 100644 --- a/src/i18n/locales/en/daoCreate.json +++ b/src/i18n/locales/en/daoCreate.json @@ -4,9 +4,9 @@ "errorLowSignerThreshold": "Threshold must be greater than 0", "errorHighSignerThreshold": "Threshold must be less than number of owners.", "labelSigThreshold": "Threshold", - "helperSigThreshold": "Number of signers needed to approve a proposal.", + "helperSigThreshold": "The number of owners required to approve a transaction on this multisig", "titleSignerAddresses": "Owners", - "subTitleSignerAddresses": "These users will be able to submit and approve proposals.", + "subTitleSignerAddresses": "These addresses will be able to approve or reject transactions on this multisig.", "titleGetStarted": "Get Started", "titleConfigureERC20": "Configure ERC-20 Token", "titleConfigureERC721": "Configure ERC-721 NFTs", @@ -28,7 +28,7 @@ "helperNFTWeight": "How many votes is this token worth?", "labelVotingPeriod": "Voting Period", "labelChooseGovernance": "Governance", - "helperChooseGovernance": "Please select a framework to add governance to your Safe.", + "helperChooseGovernance": "Select a governance schema for your DAO.", "helperVotingPeriod": "The length of time where voting is enabled after a proposal is created.", "helperQuorumERC20": "The minimum percentage of total possible votes required for a proposal to pass.", "helperQuorumERC721": "The minimum weight of total available token voting weight required for a proposal's results to be considered official.", @@ -97,7 +97,7 @@ "tooltipMultisig": "<1>Learn more", "tooltipTokenVoting": "<1>Learn more", "toastDisconnected": "Connect an account to proceed!", - "toastDisconnectedPersistent": "You'll need to connect an account to deploy this Safe.", + "toastDisconnectedPersistent": "You'll need to connect your wallet to deploy this DAO.", "tooltipNftVoting": "NFT Voting allows a group of ERC-721 (NFT) holders to propose and vote on transactions. Multiple NFT addresses can be used. <1>Learn more", "errorUnsupportedCreateOption": "Previously selected Governance option is not supported on this network.", "attachFractalModuleLabel": "Enable Clawback", From 142cf1834d33fc6642d7460b87ff4ab20e2b8d37 Mon Sep 17 00:00:00 2001 From: Kellar Date: Fri, 6 Dec 2024 14:55:44 +0000 Subject: [PATCH 2/6] Navigate to edit role details when clicking edit with role open --- src/components/Roles/RoleDetails.tsx | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/src/components/Roles/RoleDetails.tsx b/src/components/Roles/RoleDetails.tsx index d0e88589a..c4a72443c 100644 --- a/src/components/Roles/RoleDetails.tsx +++ b/src/components/Roles/RoleDetails.tsx @@ -135,19 +135,23 @@ export default function RolesDetails({ ), gap: 0, - children: t('editRoles'), - onClick: () => navigate(DAO_ROUTES.rolesEdit.relative(addressPrefix, safe.address)), + children: t('editRole'), + onClick: () => { + navigate( + DAO_ROUTES.rolesEditDetails.relative(addressPrefix, safe.address, roleHat.id), + ); + }, } : undefined } /> - - {roleHat.name} - + + {roleHat.name} + Date: Fri, 6 Dec 2024 15:00:46 +0000 Subject: [PATCH 3/6] Add back button to role/edit detail --- src/components/Roles/RoleDetails.tsx | 14 ++++++++++++-- src/components/Roles/forms/RoleFormTabs.tsx | 11 +++++++++++ 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/src/components/Roles/RoleDetails.tsx b/src/components/Roles/RoleDetails.tsx index c4a72443c..24e942dc7 100644 --- a/src/components/Roles/RoleDetails.tsx +++ b/src/components/Roles/RoleDetails.tsx @@ -1,5 +1,5 @@ -import { Badge, Box, Flex, Grid, GridItem, Icon, Text } from '@chakra-ui/react'; -import { CheckSquare, List, User } from '@phosphor-icons/react'; +import { Badge, Box, Button, Flex, Grid, GridItem, Icon, Text } from '@chakra-ui/react'; +import { ArrowLeft, CheckSquare, List, User } from '@phosphor-icons/react'; import { RefObject, useMemo, useRef } from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router-dom'; @@ -145,6 +145,7 @@ export default function RolesDetails({ : undefined } /> + {roleHat.name} +