Skip to content

Commit

Permalink
lint:fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@eshark9312
eshark9312 committed Jul 25, 2023
1 parent 60acbd6 commit e5a7543
Show file tree
Hide file tree
Showing 5 changed files with 217 additions and 194 deletions.
201 changes: 106 additions & 95 deletions packages/ui/src/memberships/modals/BuyMembershipModal/BuyMembershipFormModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@ import {
} from '../../model/validation'
import { Member } from '../../types'


interface BuyMembershipFormModalProps {
onClose: () => void
onSubmit: (params: MemberFormFields) => void
Expand Down Expand Up @@ -148,7 +147,14 @@ export const BuyMembershipForm = ({
},
})

const [handle, isReferred, isValidator, referrer, captchaToken, stashAccountSelect] = form.watch(['handle', 'isReferred', 'isValidator', 'referrer', 'captchaToken', 'stashAccountSelect'])
const [handle, isReferred, isValidator, referrer, captchaToken, stashAccountSelect] = form.watch([
'handle',
'isReferred',
'isValidator',
'referrer',
'captchaToken',
'stashAccountSelect',
])

useEffect(() => {
if (handle) {
Expand All @@ -162,28 +168,28 @@ export const BuyMembershipForm = ({
}
}, [data?.membershipsConnection.totalCount])

const isFormValid = !isUploading && form.formState.isValid && ( !isValidator || stashAccounts?.length > 1 )
const isFormValid = !isUploading && form.formState.isValid && (!isValidator || stashAccounts?.length > 1)
const isDisabled =
type === 'onBoarding' && process.env.REACT_APP_CAPTCHA_SITE_KEY ? !captchaToken || !isFormValid : !isFormValid

const addStashAccount = () => {
const accountSelection = stashAccountSelect as Account;
setStashAccounts((prevStashAccounts)=>[...prevStashAccounts,accountSelection])
const accountSelection = stashAccountSelect as Account
setStashAccounts((prevStashAccounts) => [...prevStashAccounts, accountSelection])
form?.setValue('stashAccountSelect' as keyof MemberFormFields, undefined)
}

const removeStashAccount = (index:number) => {
setStashAccounts((prevAccounts)=>prevAccounts.filter((account,ind)=>ind!==index))
const removeStashAccount = (index: number) => {
setStashAccounts((prevAccounts) => prevAccounts.filter((account, ind) => ind !== index))
}

useEffect(()=>{
const accountSelection = stashAccountSelect as Account;
if (stashAccounts.some((account)=>account === accountSelection)) {
useEffect(() => {
const accountSelection = stashAccountSelect as Account
if (stashAccounts.some((account) => account === accountSelection)) {
setIsAccountAdded(true)
} else {
setIsAccountAdded(false)
}
},[stashAccountSelect])
}, [stashAccountSelect])

return (
<>
Expand Down Expand Up @@ -268,82 +274,88 @@ export const BuyMembershipForm = ({

{type === 'general' && (
<>
<Row>
<InlineToggleWrap>
<Label>I am a validator: </Label>
<ToggleCheckbox trueLabel="Yes" falseLabel="No" name="isValidator" />
</InlineToggleWrap>
</Row>
{isValidator && (
<>
<Row>
<RowInline>
<InputComponent
id="select-stashAccount"
label="Stash account"
inputSize="l"
tooltipText="Stash account is ... TOOLTIP MUST BE PROVIDED"
>
<SelectAccount id="select-stashAccount" name="stashAccountSelect"/>
</InputComponent>
<BtnWrapper pt={30} width={65}>
<ButtonPrimary size="medium" onClick={addStashAccount}
disabled={isAccountAdded || stashAccountSelect === undefined}
>
<PlusIcon />
</ButtonPrimary>
</BtnWrapper>
</RowInline>
{isAccountAdded && (
<RowInline>
<TextSmall error><InputNotificationIcon><AlertSymbol/></InputNotificationIcon></TextSmall>
<TextSmall error>
This stash account is already added to the list.
</TextSmall>
</RowInline>
)
}
{stashAccounts.length < 2 && (
<RowInline>
<TextSmall error><InputNotificationIcon><AlertSymbol/></InputNotificationIcon></TextSmall>
<TextSmall error>
You should add at least 1 stash account.
</TextSmall>
</RowInline>
)
}
</Row>

{stashAccounts.map((stashAccount, index)=>{
if(index !== 0){
return(
<Row>
<InlineToggleWrap>
<Label>I am a validator: </Label>
<ToggleCheckbox trueLabel="Yes" falseLabel="No" name="isValidator" />
</InlineToggleWrap>
</Row>
{isValidator && (
<>
<Row>
<RowInline>
<SelectedAccount account={stashAccount as Account} key={'selected'+index}/>
<BtnWrapper width={65}>
<ButtonGhost size="medium" onClick={()=>{removeStashAccount(index)}
}>
<CrossIcon />
</ButtonGhost>
<InputComponent
id="select-stashAccount"
label="Stash account"
inputSize="l"
tooltipText="Stash account is ... TOOLTIP MUST BE PROVIDED"
>
<SelectAccount id="select-stashAccount" name="stashAccountSelect" />
</InputComponent>
<BtnWrapper pt={30} width={65}>
<ButtonPrimary
size="medium"
onClick={addStashAccount}
disabled={isAccountAdded || stashAccountSelect === undefined}
>
<PlusIcon />
</ButtonPrimary>
</BtnWrapper>
</RowInline>
</Row>)
}
})}
<Row>
<RowInline>
<Label>Status</Label>
<Tooltip
tooltipText="This is the status which indicates the selected account is actually a validator account."
>
<TooltipDefault />
</Tooltip>
<TextSmall dark> : {'Unverified'} ! </TextSmall>
</RowInline>
</Row>
</>
)}
{isAccountAdded && (
<RowInline>
<TextSmall error>
<InputNotificationIcon>
<AlertSymbol />
</InputNotificationIcon>
</TextSmall>
<TextSmall error>This stash account is already added to the list.</TextSmall>
</RowInline>
)}
{stashAccounts.length < 2 && (
<RowInline>
<TextSmall error>
<InputNotificationIcon>
<AlertSymbol />
</InputNotificationIcon>
</TextSmall>
<TextSmall error>You should add at least 1 stash account.</TextSmall>
</RowInline>
)}
</Row>

{stashAccounts.map((stashAccount, index) => {
if (index !== 0) {
return (
<Row>
<RowInline>
<SelectedAccount account={stashAccount as Account} key={'selected' + index} />
<BtnWrapper width={65}>
<ButtonGhost
size="medium"
onClick={() => {
removeStashAccount(index)
}}
>
<CrossIcon />
</ButtonGhost>
</BtnWrapper>
</RowInline>
</Row>
)
}
})}
<Row>
<RowInline>
<Label>Status</Label>
<Tooltip tooltipText="This is the status which indicates the selected account is actually a validator account.">
<TooltipDefault />
</Tooltip>
<TextSmall dark> : {'Unverified'} ! </TextSmall>
</RowInline>
</Row>
</>
)}
</>
)}

Expand Down Expand Up @@ -400,14 +412,13 @@ export const BuyMembershipForm = ({
<ButtonPrimary
size="medium"
onClick={() => {
stashAccounts.length > 1 && (
stashAccounts.map((account, index)=>{
if(index !== 0){
form?.register('stashAccounts[' + (index - 1) + ']' as keyof MemberFormFields)
form?.setValue('stashAccounts[' + (index - 1) + ']' as keyof MemberFormFields, account as Account)
stashAccounts.length > 1 &&
stashAccounts.map((account, index) => {
if (index !== 0) {
form?.register(('stashAccounts[' + (index - 1) + ']') as keyof MemberFormFields)
form?.setValue(('stashAccounts[' + (index - 1) + ']') as keyof MemberFormFields, account as Account)
}
})
)
const values = form.getValues()
uploadAvatarAndSubmit({ ...values, externalResources: { ...definedValues(values.externalResources) } })
}}
Expand Down Expand Up @@ -453,11 +464,11 @@ interface PaddingProps {
}

const BtnWrapper = styled.div<PaddingProps>`
padding-right : ${({ pr }) => ( pr ? pr + 'px' : '0px')};
padding-left : ${({ pl }) => ( pl ? pl + 'px' : '0px')};
padding-top : ${({ pt }) => ( pt ? pt + 'px' : '0px')};
padding-bottom: ${({ pb }) => ( pb ? pb + 'px' : '0px')};
width : ${({ width }) => ( width ? width + 'px' : '0px')};
display : flex;
justify-content : end;
padding-right: ${({ pr }) => (pr ? pr + 'px' : '0px')};
padding-left: ${({ pl }) => (pl ? pl + 'px' : '0px')};
padding-top: ${({ pt }) => (pt ? pt + 'px' : '0px')};
padding-bottom: ${({ pb }) => (pb ? pb + 'px' : '0px')};
width: ${({ width }) => (width ? width + 'px' : '0px')};
display: flex;
justify-content: end;
`
2 changes: 1 addition & 1 deletion packages/ui/src/memberships/modals/BuyMembershipModal/BuyMembershipModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export const BuyMembershipModal = () => {
const transaction = api.tx.members.buyMembership(toMemberTransactionParams(state.context.form))
const { form } = state.context
const service = state.children.transaction

return (
<BuyMembershipSignModal
onClose={hideModal}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/src/memberships/modals/BuyMembershipModal/BuyMembershipSignModal.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ interface SignProps {
transaction: SubmittableExtrinsic<'rxjs', ISubmittableResult> | undefined
initialSigner?: Account
service: ActorRef<any>
bondValidatorAcc?: Boolean
bondValidatorAcc?: boolean
}

export const BuyMembershipSignModal = ({
Expand Down Expand Up @@ -130,7 +130,7 @@ export const BuyMembershipSignModal = ({
<ModalTransactionFooter
transactionFee={paymentInfo?.partialFee.toBn()}
next={{
disabled: signDisabled && !bondValidatorAcc ,
disabled: signDisabled && !bondValidatorAcc,
label: formData.isValidator
? bondValidatorAcc
? 'Sign and Bond'
Expand Down
Loading

0 comments on commit e5a7543

Please sign in to comment.