-
Vote on Proposal #{voteId}
-
-
- setChecked('for')} checked={isVotingFor}>
- For
-
- setChecked('against')} checked={!isVotingFor}>
- Against
-
-
+ <>
+
{`Vote on Proposal #${voteId}`}
+
+
+ setChecked('against')}
+ checked={!isVotingFor}
+ >
+ Against
+
+ setChecked('for')} checked={isVotingFor}>
+ For
+
-
-
+
+
+
+
+
+
+ >
);
};
diff --git a/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.module.scss b/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.module.scss
index 05ad7ab2..7902f732 100644
--- a/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.module.scss
+++ b/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.module.scss
@@ -1,7 +1,38 @@
@import '../../../../styles/variables.module.scss';
+@import '../../../../styles/fonts.module.scss';
.actions {
- & > * {
- margin: 0 $space-sm;
+ display: flex;
+ flex-direction: column-reverse;
+ gap: 24px;
+ margin-top: -8px;
+
+ &,
+ > button {
+ width: 100%;
+ }
+
+ @media (min-width: $sm) {
+ flex-direction: row;
+ justify-content: center;
+ gap: 32px;
+ margin-top: 24px;
+
+ > button {
+ width: auto;
+ }
+ }
+}
+
+.confirmationText {
+ margin-top: 24px;
+ text-align: center;
+ text-wrap: pretty;
+ text-align: center;
+ color: $color-action-error-800;
+ @include font-body-15;
+
+ @media (min-width: $sm) {
+ @include font-body-9;
}
}
diff --git a/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.tsx b/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.tsx
index 03c0a200..8f015588 100644
--- a/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.tsx
+++ b/src/pages/proposals/forms/choose-delegate-action/choose-delegate-action.tsx
@@ -1,3 +1,4 @@
+import { useState } from 'react';
import Button from '../../../../components/button';
import { ModalFooter, ModalHeader } from '../../../../components/modal';
import styles from './choose-delegate-action.module.scss';
@@ -12,17 +13,53 @@ interface Props {
const ChooseDelegateAction = (props: Props) => {
const { onUpdateDelegation, onUndelegate, canUpdateDelegation, canUndelegate } = props;
+ const [confirmationStep, setConfirmationStep] = useState(false);
+
+ if (confirmationStep) {
+ return (
+ <>
+
Confirm delegation action
+
+
+
+
+
+
+
+
+ Once altered, your delegation cannot be changed again for 7 days.
+
+ >
+ );
+ }
+
return (
<>
Choose delegation action
-
diff --git a/src/pages/proposals/forms/delegate/delegate-form.tsx b/src/pages/proposals/forms/delegate/delegate-form.tsx
index 512ac110..60e74a26 100644
--- a/src/pages/proposals/forms/delegate/delegate-form.tsx
+++ b/src/pages/proposals/forms/delegate/delegate-form.tsx
@@ -1,5 +1,4 @@
import { useState } from 'react';
-import classNames from 'classnames';
import Button from '../../../../components/button';
import { Input } from '../../../../components/input';
import { ModalFooter, ModalHeader } from '../../../../components/modal';
@@ -8,7 +7,6 @@ import { useApi3Pool } from '../../../../contracts';
import { utils, constants } from 'ethers';
import * as notifications from '../../../../components/notifications';
import { messages } from '../../../../utils/messages';
-import globalStyles from '../../../../styles/global-styles.module.scss';
import styles from './delegate.module.scss';
import { handleTransactionError } from '../../../../utils';
import { convertToAddressOrThrow } from '../../../../logic/proposals/encoding/ens-name';
@@ -67,25 +65,28 @@ const DelegateVotesForm = (props: Props) => {
<>
Delegate my votes to:
-
-
{
- setDelegationAddress(e.target.value);
- setError('');
- }}
- autoFocus
- />
-
-
- You will not be able to vote on proposals while your votes are delegated. Your delegate can vote for you.
+
+
+ {
+ setDelegationAddress(e.target.value);
+ setError('');
+ }}
+ autoFocus
+ />
+
+
+ You will not be able to vote on proposals while your votes are delegated. Your delegate can vote for you.
+
-
+
Delegate
diff --git a/src/pages/proposals/forms/delegate/delegate.module.scss b/src/pages/proposals/forms/delegate/delegate.module.scss
index 6a9858a3..2b94349c 100644
--- a/src/pages/proposals/forms/delegate/delegate.module.scss
+++ b/src/pages/proposals/forms/delegate/delegate.module.scss
@@ -1,12 +1,56 @@
@import '../../../../styles/variables.module.scss';
+@import '../../../../styles/fonts.module.scss';
-.error {
- margin-top: $space-xl;
- color: $error-color;
+.delegateFormModalContent {
+ display: flex;
+ flex-direction: column;
+ gap: 48px;
text-align: center;
+ width: 100%;
+}
+
+.inputWrapper {
+ display: flex;
+ justify-content: center;
+ padding: 6px 16px;
+ height: 50px;
+ box-sizing: border-box;
+ overflow: hidden;
+
+ @media (min-width: $sm) {
+ padding: 24px 0 0 0;
+ height: 82px;
+ }
}
.subtext {
- color: $tertiary-color;
- margin-top: $space-xxxl;
+ @include font-body-15;
+ color: $color-dark-blue-400;
+ text-align: center;
+ padding: 0 24px;
+ text-wrap: pretty;
+
+ @media (min-width: $sm) {
+ @include font-body-9;
+ padding: 0;
+ }
+}
+
+.delegateButton {
+ width: 100%;
+
+ @media (min-width: $sm) {
+ width: auto;
+ }
+}
+
+.error {
+ @include font-body-15;
+ margin-top: 48px;
+ color: $color-action-error-800;
+ text-align: center;
+
+ @media (min-width: $sm) {
+ @include font-body-9;
+ }
}
diff --git a/src/styles/fonts.module.scss b/src/styles/fonts.module.scss
index 7b8cce54..b498f4bd 100644
--- a/src/styles/fonts.module.scss
+++ b/src/styles/fonts.module.scss
@@ -1,3 +1,11 @@
+@mixin font-body-2 {
+ font-family: Karla;
+ font-size: 20px;
+ font-style: normal;
+ font-weight: 600;
+ line-height: 150%; /* 30px */
+}
+
@mixin font-body-3 {
font-family: Karla;
font-size: 20px;