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.

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

Feat/198 sole voter retirement #202

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
6958873
Sole voter information page, without footer
JanJaroszczak Feb 14, 2024
4af09f9
add image for sole voter
Sworzen1 Feb 16, 2024
9f9f073
change props and dashabord card sizes
Sworzen1 Feb 16, 2024
521cd61
add sole voter into IMAGES
Sworzen1 Feb 16, 2024
b0e911d
sort IMAGES asc
Sworzen1 Feb 16, 2024
0dd76fb
add translations for sole voter card
Sworzen1 Feb 16, 2024
694c4d4
change way to display cards on dashboard/ add sole voter card
Sworzen1 Feb 16, 2024
b423888
delete unnecessary code
Sworzen1 Feb 16, 2024
27a5ae6
add feat to changelog
Sworzen1 Feb 16, 2024
11bd441
Sole voter information page, without footer
JanJaroszczak Feb 14, 2024
1d67280
add image for sole voter
Sworzen1 Feb 16, 2024
876dfa5
change props and dashabord card sizes
Sworzen1 Feb 16, 2024
a049895
add sole voter into IMAGES
Sworzen1 Feb 16, 2024
0058e4b
sort IMAGES asc
Sworzen1 Feb 16, 2024
07de49f
add translations for sole voter card
Sworzen1 Feb 16, 2024
dd8b7f0
change way to display cards on dashboard/ add sole voter card
Sworzen1 Feb 16, 2024
b319d9d
delete unnecessary code
Sworzen1 Feb 16, 2024
68571dc
add feat to changelog
Sworzen1 Feb 16, 2024
4729533
Merge branch 'feat/141-create-a-sole-voter-card' of https://github.co…
Sworzen1 Feb 16, 2024
8909a12
add retire as sole voter screen
Sworzen1 Feb 19, 2024
22be26d
add retirement to changelog
Sworzen1 Feb 19, 2024
8b11487
update home cards
Sworzen1 Feb 19, 2024
050fa07
Merge branch 'feat/141-create-a-sole-voter-card' of https://github.co…
Sworzen1 Feb 19, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ As a minor extension, we also keep a semantic version for the `UNRELEASED`
changes.

## [Unreleased]
- Add retire as Sole Voter screen [Issue 198](https://github.com/IntersectMBO/govtool/issues/198)
- Add Sole Voter card [Issue 141](https://github.com/IntersectMBO/govtool/issues/141)
- Create Checkbox component. Improve Field and ControlledField [Issue 177](https://github.com/IntersectMBO/govtool/pull/177)
- Vitest unit tests added for utils functions [Issue 81](https://github.com/IntersectMBO/govtool/issues/81)
- i18next library added to FE [Issue 80](https://github.com/IntersectMBO/govtool/issues/80)

### Fixed

- Fix copy for maintenance page [Issue 180](https://github.com/IntersectMBO/govtool/issues/180)
- Fix misleading metadata hash text [Issue 90](https://github.com/IntersectMBO/govtool/issues/90)
- Fixed vote calculation problems related to NoConfidence DRep [Issue 59](https://github.com/IntersectMBO/govtool/issues/59)
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions govtool/frontend/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import {
UpdatedRepMetadata,
GovernanceActionsCategory,
DashboardGovernanceActionsCategory,
RetireAsSoleVoter,
} from "@pages";
import {
callAll,
Expand All @@ -30,6 +31,7 @@ import {
} from "@utils";
import { SetupInterceptors } from "./services";
import { useGetDRepInfo, useWalletConnectionListener } from "./hooks";
import { RegisterAsSoleVoter } from "./pages/RegisterAsSoleVoter";

export default function App() {
const { enable, setDRep, setIsDrepLoading } = useCardano();
Expand Down Expand Up @@ -115,6 +117,11 @@ export default function App() {
</Route>
<Route path={PATHS.delegateTodRep} element={<DelegateTodRep />} />
<Route path={PATHS.registerAsdRep} element={<RegisterAsdRep />} />
<Route
path={PATHS.registerAsSoleVoter}
element={<RegisterAsSoleVoter />}
/>
<Route path={PATHS.retireAsSoleVoter} element={<RetireAsSoleVoter />} />
<Route path={PATHS.stakeKeys} element={<ChooseStakeKey />} />
<Route path={PATHS.updateMetadata} element={<UpdatedRepMetadata />} />
<Route path="*" element={<ErrorPage />} />
Expand Down
1 change: 0 additions & 1 deletion govtool/frontend/src/components/molecules/ActionCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ export const ActionCard: FC<ActionCardProps> = ({ ...props }) => {
<Button
data-testid={dataTestIdFirstButton}
onClick={firstButtonAction}
size="large"
sx={{
width: MOBILE_AND_WIDE_CONDITION ? "100%" : "auto",
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ type DashboardActionCardProps = {
firstButtonIsLoading?: boolean;
firstButtonLabel?: string;
firstButtonVariant?: ButtonProps["variant"];
imageHeight?: number;
imageURL?: string;
imageWidth?: number;
inProgress?: boolean;
isLoading?: boolean;
secondButtonAction?: () => void;
Expand Down Expand Up @@ -62,17 +60,15 @@ export const DashboardActionCard: FC<DashboardActionCardProps> = ({

return (
<Box
mb={3}
p={3}
sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
border={inProgress && !isLoading ? 1 : 0}
borderColor="accentOrange"
borderRadius={3}
flex={1}
display="flex"
flex={1}
flexDirection="column"
border={inProgress && !isLoading ? 1 : 0}
borderColor="accentOrange"
p={3}
position="relative"
maxWidth={440}
sx={{ boxShadow: `5px 5px 15px 5px ${boxShadow2}` }}
>
{inProgress && !isLoading && (
<Box
Expand Down
Loading