Skip to content

Commit

Permalink
chore: Update ts
Browse files Browse the repository at this point in the history
  • Loading branch information
chefilip committed Feb 3, 2024
1 parent 639e6aa commit 63d638b
Show file tree
Hide file tree
Showing 14 changed files with 72 additions and 62 deletions.
12 changes: 6 additions & 6 deletions apps/web/src/components/CurrencySelect/index.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { styled } from 'styled-components'
import { ArrowDropDownIcon, Box, Button, Text, useModal, Flex, BoxProps } from '@pancakeswap/uikit'
import CurrencySearchModal, { CurrencySearchModalProps } from 'components/SearchModal/CurrencySearchModal'
import { useTranslation } from '@pancakeswap/localization'
import { ArrowDropDownIcon, Box, BoxProps, Button, Flex, Text, useModal } from '@pancakeswap/uikit'
import { formatNumber } from '@pancakeswap/utils/formatBalance'
import { formatAmount } from '@pancakeswap/utils/formatFractions'
import { useCurrencyBalance } from 'state/wallet/hooks'
import CurrencySearchModal, { CurrencySearchModalProps } from 'components/SearchModal/CurrencySearchModal'
import { useStablecoinPrice } from 'hooks/useBUSDPrice'
import { useCurrencyBalance } from 'state/wallet/hooks'
import { styled } from 'styled-components'
import { useAccount } from 'wagmi'
import { AutoRow, RowBetween } from '../Layout/Row'
import { CurrencyLogo } from '../Logo'
import { RowBetween, AutoRow } from '../Layout/Row'

const DropDownHeader = styled.div`
width: 100%;
Expand Down Expand Up @@ -116,7 +116,7 @@ export const CurrencySelect = ({
</AutoRow>
<RowBetween>
<div />
{Number.isFinite(+quoted?.toExact()) && (
{quoted && Number.isFinite(+quoted?.toExact()) && (
<Text fontSize="12px" color="textSubtle">
~${formatNumber(+quoted.toExact())}
</Text>
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/components/EasyMde/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { TextareaHTMLAttributes, useEffect, useRef } from 'react'
import EasyMde from 'easymde'
import { styled } from 'styled-components'
import merge from 'lodash/merge'
import { TextareaHTMLAttributes, useEffect, useRef } from 'react'
import { styled } from 'styled-components'

import 'easymde/dist/easymde.min.css'

Expand Down
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
import { AutoRenewIcon, Box, Button, Flex, Modal, Text, ModalV2, useToast } from '@pancakeswap/uikit'
import confetti from 'canvas-confetti'
import { ChainId } from '@pancakeswap/chains'
import { useTranslation } from '@pancakeswap/localization'
import delay from 'lodash/delay'
import React, { useRef, useEffect, useState } from 'react'
import { styled } from 'styled-components'
import { AutoRenewIcon, Box, Button, Flex, Modal, ModalV2, Text, useToast } from '@pancakeswap/uikit'
import confetti from 'canvas-confetti'
import Dots from 'components/Loader/Dots'
import { useRouter } from 'next/router'
import { useAccount } from 'wagmi'
import { ToastDescriptionWithTx } from 'components/Toast'
import { useActiveChainId } from 'hooks/useActiveChainId'
import { useAnniversaryAchievementContract } from 'hooks/useContract'
import useCatchTxError from 'hooks/useCatchTxError'
import { ToastDescriptionWithTx } from 'components/Toast'
import { useAnniversaryAchievementContract } from 'hooks/useContract'
import { useShowOnceAnniversaryModal } from 'hooks/useShowOnceAnniversaryModal'
import delay from 'lodash/delay'
import { useRouter } from 'next/router'
import React, { useEffect, useRef, useState } from 'react'
import { styled } from 'styled-components'
import { useAccount } from 'wagmi'

const AnniversaryImage = styled.img`
border-radius: 50%;
Expand Down Expand Up @@ -58,8 +58,8 @@ const AnniversaryAchievementModal: React.FC<AnniversaryModalProps> = ({ excludeL
// Check claim status
useEffect(() => {
const fetchClaimAnniversaryStatus = async () => {
const canClaimAnniversary = await contract.read.canClaim([account])
setCanClaimAnniversaryPoints(canClaimAnniversary)
const canClaimAnniversary = account && (await contract.read.canClaim([account]))
setCanClaimAnniversaryPoints(Boolean(canClaimAnniversary))
}

if (account && chainId === ChainId.BSC) {
Expand Down Expand Up @@ -117,7 +117,14 @@ const AnniversaryAchievementModal: React.FC<AnniversaryModalProps> = ({ excludeL
setIsLoading(true)

try {
const receipt = await fetchWithCatchTxError(() => contract.write.claimAnniversaryPoints({ account, chainId }))
const receipt =
account &&
(await fetchWithCatchTxError(() =>
contract.write.claimAnniversaryPoints({
account,
chain: contract.chain,
}),
))

if (receipt?.status) {
toastSuccess(t('Success!'), <ToastDescriptionWithTx txHash={receipt.transactionHash} />)
Expand Down
16 changes: 8 additions & 8 deletions apps/web/src/components/Menu/UserMenu/WalletModal.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { parseEther } from 'viem'
import { useTranslation } from '@pancakeswap/localization'
import {
ButtonMenu,
ButtonMenuItem,
Expand All @@ -7,14 +7,14 @@ import {
IconButton,
InjectedModalProps,
ModalBody,
ModalTitle,
ModalWrapper,
ModalHeader as UIKitModalHeader,
ModalTitle,
} from '@pancakeswap/uikit'
import { useAccount, useBalance } from 'wagmi'
import { useState, useCallback } from 'react'
import { useTranslation } from '@pancakeswap/localization'
import { useCallback, useState } from 'react'
import { styled } from 'styled-components'
import { parseEther } from 'viem'
import { useAccount, useBalance } from 'wagmi'
import WalletInfo from './WalletInfo'
import WalletTransactions from './WalletTransactions'
import WalletWrongNetwork from './WalletWrongNetwork'
Expand Down Expand Up @@ -67,7 +67,7 @@ const WalletModal: React.FC<React.PropsWithChildren<WalletModalProps>> = ({
const { t } = useTranslation()
const { address: account } = useAccount()
const { data, isFetched } = useBalance({ address: account })
const hasLowNativeBalance = isFetched && data && data.value <= LOW_NATIVE_BALANCE
const hasLowNativeBalance = Boolean(isFetched && data && data.value <= LOW_NATIVE_BALANCE)

const handleClick = useCallback((newIndex: number) => {
setView(newIndex)
Expand All @@ -88,8 +88,8 @@ const WalletModal: React.FC<React.PropsWithChildren<WalletModalProps>> = ({
{view === WalletView.WALLET_INFO && (
<WalletInfo hasLowNativeBalance={hasLowNativeBalance} switchView={handleClick} onDismiss={onDismiss} />
)}
{view === WalletView.TRANSACTIONS && <WalletTransactions onDismiss={onDismiss} />}
{view === WalletView.WRONG_NETWORK && <WalletWrongNetwork onDismiss={onDismiss} />}
{view === WalletView.TRANSACTIONS && onDismiss && <WalletTransactions onDismiss={onDismiss} />}
{view === WalletView.WRONG_NETWORK && onDismiss && <WalletWrongNetwork onDismiss={onDismiss} />}
</ModalBody>
</ModalWrapper>
)
Expand Down
10 changes: 6 additions & 4 deletions apps/web/src/quote-worker.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import 'utils/workerPolyfill'
import { SmartRouter } from '@pancakeswap/smart-router/evm'
import { SerializedCurrency, SerializedCurrencyAmount } from '@pancakeswap/smart-router/evm/v3-router/utils/transformer'
import { Call } from 'state/multicall/actions'
import { fetchChunk } from 'state/multicall/fetchChunk'
import { createViemPublicClientGetter } from 'utils/viem'
import { getLogger } from 'utils/datadog'
import { createViemPublicClientGetter } from 'utils/viem'
import 'utils/workerPolyfill'

const { parseCurrency, parseCurrencyAmount, parsePool, serializeTrade } = SmartRouter.Transformer

Expand Down Expand Up @@ -156,8 +157,9 @@ addEventListener('message', (event: MessageEvent<WorkerEvent>) => {
} = parsed.data
const onChainProvider = createViemPublicClientGetter({ transportSignal: abortController.signal })
const onChainQuoteProvider = SmartRouter.createQuoteProvider({ onChainProvider, gasLimit })
const currencyAAmount = parseCurrencyAmount(chainId, amount)
const currencyB = parseCurrency(chainId, currency)
const currencyAAmount = parseCurrencyAmount(chainId, amount as SerializedCurrencyAmount)

const currencyB = parseCurrency(chainId, currency as SerializedCurrency)

const pools = candidatePools.map((pool) => parsePool(chainId, pool as any))

Expand Down
10 changes: 5 additions & 5 deletions apps/web/src/state/farms/fetchFarmUser.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import BigNumber from 'bignumber.js'
import { ChainId } from '@pancakeswap/chains'
import BigNumber from 'bignumber.js'
import { masterChefV2ABI } from 'config/abi/masterchefV2'
import { nonBscVaultABI } from 'config/abi/nonBscVault'
import { getMasterChefV2Address, getNonBscVaultAddress } from 'utils/addressHelpers'
import { SerializedFarmConfig } from 'config/constants/types'
import { verifyBscNetwork } from 'utils/verifyBscNetwork'
import { getCrossFarmingReceiverContract } from 'utils/contractHelpers'
import { farmFetcher } from 'state/farms'
import { Address, erc20ABI } from 'wagmi'
import { getMasterChefV2Address, getNonBscVaultAddress } from 'utils/addressHelpers'
import { getCrossFarmingReceiverContract } from 'utils/contractHelpers'
import { verifyBscNetwork } from 'utils/verifyBscNetwork'
import { publicClient } from 'utils/wagmi'
import { ContractFunctionResult } from 'viem'
import { Address, erc20ABI } from 'wagmi'

export const fetchFarmUserAllowances = async (
account: Address,
Expand Down
8 changes: 5 additions & 3 deletions apps/web/src/views/CakeStaking/hooks/useGaugesVotingCount.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,18 @@ import { SUPPORT_CAKE_STAKING } from 'config/constants/supportChains'
import { useActiveChainId } from 'hooks/useActiveChainId'
import { useGaugesVotingContract } from 'hooks/useContract'

export const useGaugesVotingCount = (): bigint | undefined => {
type VointCountData = bigint | undefined

export const useGaugesVotingCount = (): VointCountData => {
const { chainId } = useActiveChainId()
const gaugesVotingContract = useGaugesVotingContract()

const { data } = useQuery({
const { data } = useQuery<VointCountData>({
queryKey: ['gaugesVotingCount', gaugesVotingContract.address],

queryFn: async () => {
try {
const count = (await gaugesVotingContract.read.gaugeCount()) ?? 0n
const count = ((await gaugesVotingContract.read.gaugeCount()) as VointCountData) ?? 0n
return count
} catch (error) {
console.warn(error)
Expand Down
11 changes: 7 additions & 4 deletions apps/web/src/views/GaugesVoting/hooks/useUserVote.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ export type VotedSlope = {
ignoredPower?: bigint
}

type UserVoteSlopesData = [[bigint, bigint, bigint], bigint, [bigint, bigint, bigint], bigint]

const max = (a: bigint, b: bigint) => (a > b ? a : b)
const sum = (a: bigint, b: bigint) => a + b

Expand Down Expand Up @@ -76,10 +78,11 @@ export const useUserVote = (gauge?: Gauge, useProxyPool: boolean = true) => {
...calls,
] as const
if (hasProxy) {
const response = await publicClient.multicall({
const response = (await publicClient.multicall({
contracts: callsWithProxy,
allowFailure: false,
})
})) as UserVoteSlopesData

const [
[_proxySlope, _proxyPower, proxyEnd],
proxyLastVoteTime,
Expand Down Expand Up @@ -160,10 +163,10 @@ export const useUserVote = (gauge?: Gauge, useProxyPool: boolean = true) => {
ignoredSide,
}
}
const response = await publicClient.multicall({
const response = (await publicClient.multicall({
contracts: calls,
allowFailure: false,
})
})) as [[bigint, bigint, bigint], bigint]
const [[nativeSlope, nativePower, nativeEnd], lastVoteTime] = response
const voteLocked = dayjs.unix(Number(lastVoteTime)).add(10, 'day').isAfter(dayjs.unix(currentTimestamp))

Expand Down
11 changes: 2 additions & 9 deletions apps/web/src/views/GaugesVoting/hooks/useUserVoteGauges.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,7 @@ import { useQuery } from '@tanstack/react-query'
import useAccountActiveChain from 'hooks/useAccountActiveChain'
import { useGaugesVotingContract } from 'hooks/useContract'
import { useMemo } from 'react'
import {
ContractFunctionConfig,
ContractFunctionResult,
Hex,
MulticallContracts,
isAddressEqual,
zeroAddress,
} from 'viem'
import { ContractFunctionConfig, Hex, MulticallContracts, isAddressEqual, zeroAddress } from 'viem'
import { useVeCakeUserInfo } from 'views/CakeStaking/hooks/useVeCakeUserInfo'
import { usePublicClient } from 'wagmi'
import { useGauges } from './useGauges'
Expand Down Expand Up @@ -68,7 +61,7 @@ export const useUserVoteSlopes = () => {
const response = (await publicClient.multicall({
contracts,
allowFailure: false,
})) as ContractFunctionResult<typeof gaugesVotingABI, 'voteUserSlopes'>[]
})) as [bigint, bigint, bigint][]

const len = gauges.length
return gauges.map((gauge, index) => {
Expand Down
6 changes: 3 additions & 3 deletions apps/web/src/views/Voting/CreateProposal/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import {
Flex,
Heading,
Input,
ReactMarkdown,
ScanLink,
Text,
useModal,
useToast,
ReactMarkdown,
ScanLink,
} from '@pancakeswap/uikit'
import snapshot from '@snapshot-labs/snapshot.js'
import isEmpty from 'lodash/isEmpty'
Expand All @@ -34,7 +34,7 @@ import { useAccount, useWalletClient } from 'wagmi'
import Layout from '../components/Layout'
import VoteDetailsModal from '../components/VoteDetailsModal'
import { ADMINS, PANCAKE_SPACE, VOTE_THRESHOLD } from '../config'
import Choices, { ChoiceIdValue, makeChoice, MINIMUM_CHOICES } from './Choices'
import Choices, { ChoiceIdValue, MINIMUM_CHOICES, makeChoice } from './Choices'
import { combineDateAndTime, getFormErrors } from './helpers'
import { FormErrors, Label, SecondaryLabel } from './styles'
import { FormState } from './types'
Expand Down
1 change: 1 addition & 0 deletions apps/web/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"extends": "@pancakeswap/tsconfig/nextjs.json",
"compilerOptions": {
"baseUrl": "./",
"strict": true,
"strictNullChecks": true,
"noImplicitAny": false,
"noFallthroughCasesInSwitch": true,
Expand Down
12 changes: 6 additions & 6 deletions packages/smart-router/legacy-router/onchain/getStableSwapFee.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { Currency, CurrencyAmount } from '@pancakeswap/sdk'
import { ChainId } from '@pancakeswap/chains'
import { Currency, CurrencyAmount } from '@pancakeswap/sdk'

import { infoStableSwapABI } from '../../evm/abis/InfoStableSwap'
import { STABLE_SWAP_INFO_ADDRESS } from '../../evm/constants'
import { wrappedCurrencyAmount } from '../../evm/utils/currency'
import { Provider, StableSwapFeeRaw, StableSwapPair } from '../types'
import { getOutputToken } from '../utils/pair'
import { StableSwapPair, Provider, StableSwapFeeRaw } from '../types'
import { STABLE_SWAP_INFO_ADDRESS } from '../../evm/constants'
import { infoStableSwapABI } from '../../evm/abis/InfoStableSwap'

export function getStableSwapFeeCall(pair: StableSwapPair, inputAmount: CurrencyAmount<Currency>) {
const { chainId } = inputAmount.currency
Expand Down Expand Up @@ -47,10 +47,10 @@ export async function getStableSwapFee(

const client = provider({ chainId })

const [[feeRaw, adminFeeRaw]] = await client.multicall({
const [[feeRaw, adminFeeRaw]] = (await client.multicall({
contracts: [call],
allowFailure: false,
})
})) as [[bigint, bigint]]

return {
fee: CurrencyAmount.fromRawAmount(outputToken, feeRaw),
Expand Down
1 change: 1 addition & 0 deletions packages/uikit/src/components/Chart/index.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { LanguageProvider } from "@pancakeswap/localization";
import { Meta, Story } from "@storybook/react";
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import React from "react";
import { Box } from "../Box";
import { PairDataTimeWindowEnum, SwapLineChart, SwapLineChartNewProps } from "./PairPriceChart";
Expand Down
1 change: 1 addition & 0 deletions packages/uikit/src/components/Toast/Toast.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Meta, StoryObj } from "@storybook/react";
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import React from "react";
import { useToast } from "../../contexts";
import { Button } from "../Button";
Expand Down

0 comments on commit 63d638b

Please sign in to comment.