Compare commits

..
Author SHA1 Message Date
Bill He e796bdd149 Fix if conditioned before hooks 2024-01-30 13:09:13 -08:00
2 changed files with 12 additions and 23 deletions
+9 -19
View File
@@ -24,25 +24,15 @@ export const Checkbox: React.FC<CheckboxProps> = ({
onCheckedChange, onCheckedChange,
id, id,
label, label,
disabled, disabled
}) => ( }) => (
<Styled.Container> <Styled.Container>
<Styled.Root <Styled.Root className={className} checked={checked} disabled={disabled} onCheckedChange={onCheckedChange} id={id}>
className={className}
checked={checked}
disabled={disabled}
onCheckedChange={onCheckedChange}
id={id}
>
<Styled.Indicator> <Styled.Indicator>
<CheckIcon /> <CheckIcon />
</Styled.Indicator> </Styled.Indicator>
</Styled.Root> </Styled.Root>
{label && ( {label && <Styled.label disabled={disabled} htmlFor={id}>{label}</Styled.label>}
<Styled.Label disabled={disabled} htmlFor={id}>
{label}
</Styled.Label>
)}
</Styled.Container> </Styled.Container>
); );
@@ -52,6 +42,10 @@ Styled.Container = styled.div`
${layoutMixins.row} ${layoutMixins.row}
gap: 1ch; gap: 1ch;
font: var(--font-small-book); font: var(--font-small-book);
label {
cursor: pointer;
}
`; `;
Styled.Root = styled(Root)` Styled.Root = styled(Root)`
@@ -83,14 +77,10 @@ Styled.Indicator = styled(Indicator)`
color: var(--color-text-2); color: var(--color-text-2);
`; `;
Styled.Label = styled.label<{ disabled?: boolean }>` Styled.label = styled.div<{ disabled: boolean; }>`
cursor: pointer;
color: var(--color-text-2); color: var(--color-text-2);
${({ disabled }) => ${({disabled}) => disabled && css`
disabled &&
css`
cursor: not-allowed;
color: var(--color-text-0); color: var(--color-text-0);
`} `}
`; `;
@@ -55,6 +55,7 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
const stringGetter = useStringGetter(); const stringGetter = useStringGetter();
const [error, setError] = useState<Error | null>(null); const [error, setError] = useState<Error | null>(null);
const [isLoading, setIsLoading] = useState(false); const [isLoading, setIsLoading] = useState(false);
const [requireUserActionInWallet, setRequireUserActionInWallet] = useState(false);
const { selectedNetwork } = useSelectedNetwork(); const { selectedNetwork } = useSelectedNetwork();
const { evmAddress, signerWagmi, publicClientWagmi, nobleAddress } = useAccounts(); const { evmAddress, signerWagmi, publicClientWagmi, nobleAddress } = useAccounts();
@@ -373,8 +374,6 @@ export const DepositForm = ({ onDeposit, onError }: DepositFormProps) => {
return <LoadingSpace id="DepositForm" />; return <LoadingSpace id="DepositForm" />;
} }
const [requireUserActionInWallet, setRequireUserActionInWallet] = useState(false);
return ( return (
<Styled.Form onSubmit={onSubmit}> <Styled.Form onSubmit={onSubmit}>
<SourceSelectMenu <SourceSelectMenu