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

ENG-4832 feat(portal): use graphql queries within follow modal #943

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ function CreateClaimForm({
}
return 2000
},
queryKey: ['GetTriple', { id: vaultId ? parseFloat(vaultId) : 0 }],
queryKey: ['get-triple', { id: vaultId ? parseFloat(vaultId) : 0 }],
},
)

Expand Down
7 changes: 2 additions & 5 deletions apps/portal/app/components/follow/follow-button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import { Button, cn } from '@0xintuition/1ui'

import { stakeModalAtom } from '@lib/state/store'
import { getChainEnvConfig } from '@lib/utils/environment'
import { formatBalance } from '@lib/utils/misc'
import { useNavigation } from '@remix-run/react'
import { CURRENT_ENV } from 'app/consts'
import {
Expand Down Expand Up @@ -120,10 +119,8 @@ const FollowButton: React.FC<FollowButtonProps> = ({
handleSwitch()
} else if (val !== '') {
const errors = []
if (+val < +formatUnits(BigInt(min_deposit), 18)) {
errors.push(
`Minimum deposit is ${formatBalance(min_deposit, 18)} ETH`,
)
if (+val < +min_deposit) {
errors.push(`Minimum deposit is ${min_deposit} ETH`)
}
if (+val * +formattedConvictionPrice > +walletBalance) {
errors.push('Insufficient funds')
Expand Down
31 changes: 13 additions & 18 deletions apps/portal/app/components/follow/follow-form.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,11 @@ import {
Identity,
Text,
} from '@0xintuition/1ui'
import { IdentityPresenter } from '@0xintuition/api'

import { InfoTooltip } from '@components/info-tooltip'
import StakingRadioGroup from '@components/staking-radio-group'
import { TransactionState } from '@components/transaction-state'
import {
formatBalance,
getAtomDescription,
getAtomImage,
getAtomIpfsLink,
getAtomLabel,
getAtomLink,
} from '@lib/utils/misc'
import { formatBalance } from '@lib/utils/misc'
import {
TransactionActionType,
TransactionStateType,
Expand All @@ -32,7 +24,8 @@ import FollowReview from './follow-review'

interface FollowFormProps {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perfect!
We'll finetune this as we fully iron out the actual type we'll end up using

walletBalance: string
identity: IdentityPresenter
identityLabel: string
identityAvatar: string
user_assets: string
entry_fee: string
exit_fee: string
Expand All @@ -50,7 +43,8 @@ interface FollowFormProps {

export default function FollowForm({
walletBalance,
identity,
identityLabel,
identityAvatar,
user_assets,
entry_fee,
exit_fee,
Expand Down Expand Up @@ -122,12 +116,12 @@ export default function FollowForm({
}}
object={{
variant: Identity.user,
label: getAtomLabel(identity),
imgSrc: getAtomImage(identity),
id: identity.identity_id,
description: getAtomDescription(identity),
ipfsLink: getAtomIpfsLink(identity),
link: getAtomLink(identity),
label: identityLabel,
imgSrc: identityAvatar,
id: '',
description: '',
ipfsLink: '',
link: '',
shouldHover: false,
}}
maxIdentityLength={16}
Expand Down Expand Up @@ -163,7 +157,8 @@ export default function FollowForm({
val={val}
dispatch={dispatch}
state={state}
identity={identity}
identityLabel={identityLabel}
identityAvatar={identityAvatar}
user_assets={user_assets}
entry_fee={entry_fee}
exit_fee={exit_fee}
Expand Down
109 changes: 71 additions & 38 deletions apps/portal/app/components/follow/follow-modal.tsx
Original file line number Diff line number Diff line change
@@ -1,21 +1,23 @@
import { useEffect, useState } from 'react'

import { Dialog, DialogContent, DialogFooter, toast } from '@0xintuition/1ui'
import { ClaimPresenter, IdentityPresenter } from '@0xintuition/api'
import { useGetTripleQuery } from '@0xintuition/graphql'

import { multivaultAbi } from '@lib/abis/multivault'
import { useFollowMutation } from '@lib/hooks/mutations/useFollowMutation'
import { useCheckClaim } from '@lib/hooks/useCheckClaim'
import { useCreateClaimConfig } from '@lib/hooks/useCreateClaimConfig'
import { useGetVaultDetails } from '@lib/hooks/useGetVaultDetails'
import { useGetWalletBalance } from '@lib/hooks/useGetWalletBalance'
import { transactionReducer } from '@lib/hooks/useTransactionReducer'
import { getSpecialPredicate } from '@lib/utils/app'
import { useGenericTxState } from '@lib/utils/use-tx-reducer'
import { useLocation } from '@remix-run/react'
import { MIN_DEPOSIT } from 'app/consts'
import { CURRENT_ENV, MIN_DEPOSIT } from 'app/consts'
import {
TransactionActionType,
TransactionStateType,
} from 'app/types/transaction'
import { VaultDetailsType } from 'app/types/vault'
import { Address, decodeEventLog } from 'viem'
import { useAccount, usePublicClient } from 'wagmi'

Expand All @@ -34,30 +36,21 @@ interface FollowModalProps {
userWallet: string
contract: string
open: boolean
identity: IdentityPresenter
claim: ClaimPresenter
vaultDetails: VaultDetailsType
identityVaultId: string
identityLabel: string
identityAvatar: string
onClose?: () => void
}

export default function FollowModal({
userWallet,
contract,
open = false,
identity,
claim,
vaultDetails,
identityVaultId,
identityLabel,
identityAvatar,
onClose = () => {},
}: FollowModalProps) {
const {
conviction_price = '0',
user_conviction = '0',
user_assets = '0',
min_deposit = '0',
formatted_entry_fee = '0',
formatted_exit_fee = '0',
} = vaultDetails ? vaultDetails : {}

const [val, setVal] = useState(MIN_DEPOSIT)
const [mode, setMode] = useState<'follow' | 'unfollow'>('follow')
const [showErrors, setShowErrors] = useState(false)
Expand All @@ -68,13 +61,47 @@ export default function FollowModal({
TransactionActionType
>(transactionReducer, initialTxState)
const publicClient = usePublicClient()
const userVaultId = identity.vault_id

let vault_id: string = '0'
vault_id = claim ? claim.vault_id : '0'

const { address } = useAccount()

const { data: claimCheckData } = useCheckClaim({
subjectId: getSpecialPredicate(CURRENT_ENV).iPredicate.vaultId.toString(),
predicateId:
getSpecialPredicate(CURRENT_ENV).amFollowingPredicate.vaultId.toString(),
objectId: identityVaultId,
})

const { data: claimData } = useGetTripleQuery(
{ tripleId: claimCheckData?.result },
{
enabled: Boolean(claimCheckData?.result !== '0'),
retry: 1,
retryDelay: 2000,
refetchInterval: (query) => {
if (query.state.status === 'success') {
return false
}
return 2000
},
queryKey: ['get-triple', { id: claimCheckData?.result }],
},
)

const vaultDetails = useGetVaultDetails(
contract,
claimData?.triple?.vaultId,
claimData?.triple?.counterVaultId,
{
queryKey: [
'get-vault-details',
contract,
claimData?.triple?.vaultId,
claimData?.triple?.counterVaultId,
],
enabled: open,
},
)

const { data: configData, isLoading: isLoadingConfig } =
useCreateClaimConfig()

Expand All @@ -85,18 +112,21 @@ export default function FollowModal({
awaitingOnChainConfirmation,
isError,
reset,
} = useFollowMutation(contract, claim, user_conviction, mode)
} = useFollowMutation(
contract,
vaultDetails?.data?.user_conviction ?? '0',
mode,
claimData?.triple?.vaultId,
)

const handleAction = async () => {
try {
const txHash = await follow({
val,
userWallet,
vaultId: vault_id,
claim,
identity,
vaultId: claimData?.triple?.vaultId,
tripleCost: BigInt(configData?.fees.tripleCost ?? '0'),
userVaultId,
userVaultId: identityVaultId,
})

if (publicClient && txHash) {
Expand Down Expand Up @@ -229,7 +259,7 @@ export default function FollowModal({
}

const handleUnfollowButtonClick = async () => {
if (+val > +(user_conviction ?? '0')) {
if (+val > +(vaultDetails?.data?.user_conviction ?? '0')) {
setShowErrors(true)
return
}
Expand Down Expand Up @@ -273,11 +303,12 @@ export default function FollowModal({
<div className="flex-grow">
<FollowForm
walletBalance={walletBalance}
identity={identity}
min_deposit={min_deposit}
user_assets={user_assets ?? '0'}
entry_fee={formatted_entry_fee ?? '0'}
exit_fee={formatted_exit_fee ?? '0'}
identityLabel={identityLabel}
identityAvatar={identityAvatar}
min_deposit={vaultDetails?.data?.min_deposit ?? MIN_DEPOSIT}
user_assets={vaultDetails?.data?.user_assets ?? '0'}
entry_fee={vaultDetails?.data?.formatted_entry_fee ?? '0'}
exit_fee={vaultDetails?.data?.formatted_exit_fee ?? '0'}
val={val}
setVal={setVal}
mode={mode}
Expand All @@ -298,9 +329,9 @@ export default function FollowModal({
handleClose={handleClose}
dispatch={dispatch}
state={state}
user_conviction={user_conviction ?? '0'}
user_conviction={vaultDetails?.data?.user_conviction ?? '0'}
isLoadingConfig={isLoadingConfig}
className={`${(user_conviction && user_conviction > '0' && state.status === 'idle') || mode !== 'follow' ? '' : 'hidden'}`}
className={`${(vaultDetails?.data?.user_conviction && vaultDetails?.data?.user_conviction > '0' && state.status === 'idle') || mode !== 'follow' ? '' : 'hidden'}`}
/>
<FollowButton
val={val}
Expand All @@ -309,10 +340,12 @@ export default function FollowModal({
handleClose={handleClose}
dispatch={dispatch}
state={state}
min_deposit={min_deposit}
min_deposit={
vaultDetails?.data?.formatted_min_deposit ?? MIN_DEPOSIT
}
walletBalance={walletBalance}
conviction_price={conviction_price ?? '0'}
user_assets={user_assets ?? '0'}
conviction_price={vaultDetails?.data?.conviction_price ?? '0'}
user_assets={vaultDetails?.data?.user_assets ?? '0'}
setValidationErrors={setValidationErrors}
setShowErrors={setShowErrors}
isLoadingConfig={isLoadingConfig}
Expand Down
11 changes: 6 additions & 5 deletions apps/portal/app/components/follow/follow-review.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
Identity,
Text,
} from '@0xintuition/1ui'
import { IdentityPresenter } from '@0xintuition/api'

import { getSpecialPredicate } from '@lib/utils/app'
import { formatBalance, formatDisplayBalance } from '@lib/utils/misc'
Expand All @@ -25,7 +24,8 @@ interface FollowReviewProps {
dispatch: (action: TransactionActionType) => void
state: TransactionStateType
isError?: boolean
identity: IdentityPresenter
identityLabel: string
identityAvatar: string
user_assets: string
entry_fee: string
exit_fee: string
Expand All @@ -37,7 +37,8 @@ export default function FollowReview({
dispatch,
state,
isError,
identity,
identityLabel,
identityAvatar,
user_assets,
entry_fee,
exit_fee,
Expand Down Expand Up @@ -113,8 +114,8 @@ export default function FollowReview({
}}
object={{
variant: Identity.user,
imgSrc: identity.user?.image ?? identity.image,
label: identity.user?.display_name ?? identity.display_name,
imgSrc: identityAvatar,
label: identityLabel,
shouldHover: false,
}}
/>
Expand Down
Loading
Loading