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.

Sign up for GitHub

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

Jump to bottom

vault category auto select #97

Merged
merged 3 commits into from
Jan 25, 2024
Merged

vault category auto select #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51a004e
feat: vault category auto select
lucasmagnus Jan 24, 2024
df6e774
feat: disabled option
lucasmagnus Jan 24, 2024
f46a894
feat: remove * from contract create
lucasmagnus Jan 24, 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
14 changes: 7 additions & 7 deletions frontend/src/components/templates/contracts-create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({
<form onSubmit={handleSubmit(data => handleForm(data))}>
<Flex flexDir={{ base: 'column', md: 'row' }} gap="1.5rem">
<FormControl isInvalid={errors?.vault !== undefined}>
<FormLabel>Vault*</FormLabel>
<FormLabel>Vault</FormLabel>
<SelectVault
vaults={vaults}
setVault={setVault}
Expand All @@ -172,7 +172,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({
</FormControl>

<FormControl isInvalid={errors?.asset !== undefined}>
<FormLabel>Asset*</FormLabel>
<FormLabel>Asset</FormLabel>
<SelectAsset
assets={filteredAssets()}
setAsset={setAsset}
Expand All @@ -197,7 +197,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({
gap="1.5rem"
>
<FormControl isInvalid={errors?.min_deposit !== undefined}>
<FormLabel>Minimum Deposit*</FormLabel>
<FormLabel>Minimum Deposit</FormLabel>
<Input
as={NumericFormat}
decimalScale={7}
Expand All @@ -216,7 +216,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({
</FormControl>

<FormControl isInvalid={errors?.term !== undefined}>
<FormLabel>Term*</FormLabel>
<FormLabel>Term</FormLabel>
<InputGroup>
<Input
as={NumericFormat}
Expand Down Expand Up @@ -244,7 +244,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({
>
<FormControl isInvalid={errors?.yield_rate !== undefined}>
<FormLabel display="flex" alignItems="center" gap={2}>
Yield Rate*{' '}
Yield Rate{' '}
<Tooltip label={TooltipsData.yieldRate}>
<HelpIcon width="14px" />
</Tooltip>
Expand All @@ -269,7 +269,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({

<FormControl isInvalid={errors?.penalty_rate !== undefined}>
<FormLabel display="flex" alignItems="center" gap={2}>
Early Redemption Penalty Rate*
Early Redemption Penalty Rate
<Tooltip label={TooltipsData.penaltyRate}>
<HelpIcon width="14px" />
</Tooltip>
Expand Down Expand Up @@ -309,7 +309,7 @@ export const ContractsCreateTemplate: React.FC<IContractsCreateTemplate> = ({
_dark={{ bg: 'black.600' }}
>
<FormControl w="full">
<FormLabel>Interest type*</FormLabel>
<FormLabel>Interest type</FormLabel>
<SelectCompoundType
compoundType={compoundType}
setCompoundType={setCompoundType}
Expand Down
1 change: 1 addition & 0 deletions frontend/src/components/templates/vault-create/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import { SelectCategory } from './select-category'
export interface IOption {
readonly label: string
readonly value: number
readonly disabled: boolean
}

interface IVaultCreateTemplate {
Expand Down
25 changes: 20 additions & 5 deletions frontend/src/components/templates/vault-create/select-category/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,26 @@ interface ISelectCategory {
clearErrors?(): void
}

const createOption = (label: string, value: number): IOption => ({
const createOption = (
label: string,
value: number,
disabled?: boolean
): IOption => ({
label,
value: value,
disabled: disabled ?? false,
})

export const SelectCategory: React.FC<ISelectCategory> = ({
vaultCategories,
createVaultCategory,
setCategorySelected,
categorySelected,
clearErrors
clearErrors,
}) => {
const [isLoading, setIsLoading] = useState(false)
const [options, setOptions] = useState<IOption[]>([])
const [value, setValue] = useState<IOption>()

const { colorMode } = useColorMode()

Expand All @@ -41,14 +47,16 @@ export const SelectCategory: React.FC<ISelectCategory> = ({
setIsLoading(false)
setOptions(prev => [...prev, newOption])
setCategorySelected(newOption)
setValue(newOption)
}, 1000)
}

useEffect(() => {
const ops = vaultCategories?.map(
let ops = vaultCategories?.map(
(vaultCategory: Hooks.UseVaultsTypes.IVaultCategory) =>
createOption(vaultCategory.name, vaultCategory.id)
)
ops = [...(ops || []), createOption('Type to create...', 0, true)]
setOptions(ops || [])
}, [vaultCategories])

Expand All @@ -59,13 +67,19 @@ export const SelectCategory: React.FC<ISelectCategory> = ({
isLoading={isLoading}
onCreateOption={handleVaultCategory}
options={options}
value={value}
isOptionDisabled={(option): boolean => option.disabled}
onChange={(newValue): void => {
if (clearErrors) clearErrors()
setCategorySelected(newValue)
}}
defaultValue={
categorySelected
? { value: categorySelected.value, label: categorySelected.label }
? {
value: categorySelected.value,
label: categorySelected.label,
disabled: false,
}
: undefined
}
styles={{
Expand All @@ -80,9 +94,10 @@ export const SelectCategory: React.FC<ISelectCategory> = ({
...base,
backgroundColor: colorMode === 'dark' ? '#303448' : undefined,
}),
option: (styles, { isFocused, isSelected }) => ({
option: (styles, { isFocused, isSelected, isDisabled }) => ({
...styles,
color: colorMode === 'dark' ? 'white' : 'black',
opacity: isDisabled ? '0.5' : undefined,
background: isFocused
? colorMode === 'dark'
? '#292d3e'
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/templates/vault-detail/components/header/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const Form: React.FC<IHeader> = ({
}) => {
const [categorySelected, setCategorySelected] = useState<
IOption | null | undefined
>(category && { label: category?.name, value: category?.id })
>(category && { label: category?.name, value: category?.id, disabled: false })

const [name, setName] = useState<string | undefined>(vault.name)

Expand Down