From abf5afce20fc01ddc024c2ae6aadc3a36d0d4627 Mon Sep 17 00:00:00 2001 From: Chan Jing Hong Date: Fri, 3 May 2024 15:57:43 +0800 Subject: [PATCH] prettier --- governance/src/App.tsx | 13 ++-- .../src/components/Wallet/AccountStatus.tsx | 9 ++- .../Wallet/Airdrop/AirdropBreakdown.tsx | 71 +++++++------------ .../Wallet/Airdrop/AirdropButton.tsx | 3 +- .../components/Wallet/Airdrop/AirdropInfo.tsx | 14 ++-- .../Wallet/Airdrop/AirdropModal.tsx | 26 ++++--- governance/src/hooks/airdrop/useAirdrop.ts | 40 ++++++----- governance/src/hooks/useMerkleDistributor.ts | 5 +- shared/src/store/types.ts | 5 +- 9 files changed, 94 insertions(+), 92 deletions(-) diff --git a/governance/src/App.tsx b/governance/src/App.tsx index c14dab75..cf609865 100644 --- a/governance/src/App.tsx +++ b/governance/src/App.tsx @@ -8,7 +8,10 @@ import { SolflareWalletAdapter, } from "@solana/wallet-adapter-wallets"; -import { WalletProvider as SolanaWalletProvider, ConnectionProvider } from "@solana/wallet-adapter-react"; +import { + WalletProvider as SolanaWalletProvider, + ConnectionProvider, +} from "@solana/wallet-adapter-react"; import { SubgraphDataContextProvider } from "shared/lib/hooks/subgraphDataContext"; import RootApp from "./components/RootApp"; import { Web3ContextProvider } from "shared/lib/hooks/web3Context"; @@ -43,10 +46,10 @@ function App() { {/* This is just to prevent useWeb3Wallet from breaking */} - + diff --git a/governance/src/components/Wallet/AccountStatus.tsx b/governance/src/components/Wallet/AccountStatus.tsx index bba845bc..078b6d7b 100644 --- a/governance/src/components/Wallet/AccountStatus.tsx +++ b/governance/src/components/Wallet/AccountStatus.tsx @@ -227,7 +227,7 @@ const AccountStatus: React.FC = ({ variant }) => { const [copyState, setCopyState] = useState<"visible" | "hiding" | "hidden">( "hidden" ); - const [showAirdropModal, setShowAirdropModal] = useState(false) + const [showAirdropModal, setShowAirdropModal] = useState(false); const { data: ensData } = useENSSearch(account || ""); @@ -342,7 +342,10 @@ const AccountStatus: React.FC = ({ variant }) => { return ( <> - setShowAirdropModal(false)}/> + setShowAirdropModal(false)} + /> {/* Main Button and Desktop Menu */} @@ -396,7 +399,7 @@ const AccountStatus: React.FC = ({ variant }) => { )} - setShowAirdropModal(true)}/> + setShowAirdropModal(true)} /> diff --git a/governance/src/components/Wallet/Airdrop/AirdropBreakdown.tsx b/governance/src/components/Wallet/Airdrop/AirdropBreakdown.tsx index f0d31c4f..dc212217 100644 --- a/governance/src/components/Wallet/Airdrop/AirdropBreakdown.tsx +++ b/governance/src/components/Wallet/Airdrop/AirdropBreakdown.tsx @@ -1,8 +1,5 @@ import { useCallback } from "react"; -import { - BaseIndicator, - Subtitle -} from "shared/lib/designSystem"; +import { BaseIndicator, Subtitle } from "shared/lib/designSystem"; import { CloseIcon } from "shared/lib/assets/icons/icons"; import colors from "shared/lib/designSystem/colors"; import theme from "shared/lib/designSystem/theme"; @@ -10,8 +7,8 @@ import { AirdropBreakdownKeys } from "shared/lib/store/types"; import styled from "styled-components"; export const getQualifiedColor = (qualified: boolean) => { - return qualified ? colors.green : colors.red -} + return qualified ? colors.green : colors.red; +}; const getAirdropTitle = (variant: AirdropBreakdownKeys) => { switch (variant) { @@ -48,7 +45,7 @@ const BreakdownPill = styled.div<{ border-radius: 100px; `; -const BreakdownPillToken = styled(Subtitle) <{ +const BreakdownPillToken = styled(Subtitle)<{ qualified: boolean; }>` color: ${(props) => getQualifiedColor(props.qualified)}; @@ -57,8 +54,8 @@ const BreakdownPillToken = styled(Subtitle) <{ interface AirdropBreakdownProps { breakdown?: { - [key in AirdropBreakdownKeys]: boolean - } + [key in AirdropBreakdownKeys]: boolean; + }; } const AirdropBreakdown = ({ breakdown }: AirdropBreakdownProps) => { @@ -69,17 +66,15 @@ const AirdropBreakdown = ({ breakdown }: AirdropBreakdownProps) => { {getAirdropTitle(key)} - { - qualified - ? ( - - ) : ( - - ) - } + {qualified ? ( + + ) : ( + + )} ), @@ -88,31 +83,19 @@ const AirdropBreakdown = ({ breakdown }: AirdropBreakdownProps) => { return ( - { - breakdown - ? Object.keys(breakdown).map((key) => - renderBreakdownPill( - key as AirdropBreakdownKeys, - breakdown[key as AirdropBreakdownKeys] - ) - ) - : ( - <> - { - renderBreakdownPill( - AirdropBreakdownKeys.maxStaked, - false - ) - } - { - renderBreakdownPill( - AirdropBreakdownKeys.heldRbnAfterTGE, - false - ) - } - + {breakdown ? ( + Object.keys(breakdown).map((key) => + renderBreakdownPill( + key as AirdropBreakdownKeys, + breakdown[key as AirdropBreakdownKeys] ) - } + ) + ) : ( + <> + {renderBreakdownPill(AirdropBreakdownKeys.maxStaked, false)} + {renderBreakdownPill(AirdropBreakdownKeys.heldRbnAfterTGE, false)} + + )} ); }; diff --git a/governance/src/components/Wallet/Airdrop/AirdropButton.tsx b/governance/src/components/Wallet/Airdrop/AirdropButton.tsx index 0eb77578..697f1a72 100644 --- a/governance/src/components/Wallet/Airdrop/AirdropButton.tsx +++ b/governance/src/components/Wallet/Airdrop/AirdropButton.tsx @@ -26,7 +26,7 @@ const ButtonContainer = styled.div` &:hover { ${ClaimText} { - color: #fff; + color: #fff; } } `; @@ -37,7 +37,6 @@ const LogoContainer = styled.div` margin-right: 8px; `; - const RedLogo = styled(Logo)` circle { fill: ${colors.products.yield}3D; diff --git a/governance/src/components/Wallet/Airdrop/AirdropInfo.tsx b/governance/src/components/Wallet/Airdrop/AirdropInfo.tsx index b2ba2774..0a07a3c0 100644 --- a/governance/src/components/Wallet/Airdrop/AirdropInfo.tsx +++ b/governance/src/components/Wallet/Airdrop/AirdropInfo.tsx @@ -50,7 +50,6 @@ const Description = styled(SecondaryText)` text-align: center; `; - const ViewBreakdownPill = styled.div` display: flex; background: ${colors.green}14; @@ -158,12 +157,16 @@ interface AirdropInfoProps { onClaim: () => void; } -const AirdropInfo: React.FC = ({ loading, airdropInfo, onClaim }) => { +const AirdropInfo: React.FC = ({ + loading, + airdropInfo, + onClaim, +}) => { const { account } = useWeb3Wallet(); const [, setShowConnectModal] = useConnectWalletModal(); const [showBreakdown, setShowBreakdown] = useState(false); - const loadingText = useLoadingText("") + const loadingText = useLoadingText(""); const airdropAmountStr = useMemo(() => { if (!airdropInfo) { @@ -248,7 +251,8 @@ const AirdropInfo: React.FC = ({ loading, airdropInfo, onClaim - A total of 1,933,802 RBN was distributed to accounts that locked their $RBN for two years. + A total of 1,933,802 RBN was distributed to accounts that locked + their $RBN for two years. @@ -355,4 +359,4 @@ const AirdropInfo: React.FC = ({ loading, airdropInfo, onClaim export default AirdropInfo; -// export const x = "" \ No newline at end of file +// export const x = "" diff --git a/governance/src/components/Wallet/Airdrop/AirdropModal.tsx b/governance/src/components/Wallet/Airdrop/AirdropModal.tsx index e5e12c58..ac6783cf 100644 --- a/governance/src/components/Wallet/Airdrop/AirdropModal.tsx +++ b/governance/src/components/Wallet/Airdrop/AirdropModal.tsx @@ -52,7 +52,7 @@ const AirdropModal: React.FC = ({ show, onClose }) => { await provider.waitForTransaction(txhash, 2); setStep("claimed"); } catch (err) { - console.error(err) + console.error(err); setStep("info"); } }, [ @@ -86,28 +86,32 @@ const AirdropModal: React.FC = ({ show, onClose }) => { initial: step === "info" || step === "claim" ? { - x: 50, - opacity: 0, - } + x: 50, + opacity: 0, + } : {}, animate: step === "info" || step === "claim" ? { - x: 0, - opacity: 1, - } + x: 0, + opacity: 1, + } : {}, exit: step === "info" ? { - x: -50, - opacity: 0, - } + x: -50, + opacity: 0, + } : {}, }} > {step === "info" ? ( - + ) : ( )} diff --git a/governance/src/hooks/airdrop/useAirdrop.ts b/governance/src/hooks/airdrop/useAirdrop.ts index 4d2d89c2..98017ab4 100644 --- a/governance/src/hooks/airdrop/useAirdrop.ts +++ b/governance/src/hooks/airdrop/useAirdrop.ts @@ -8,7 +8,10 @@ import { usePendingTransactions } from "shared/lib/hooks/pendingTransactionsCont import { impersonateAddress } from "shared/lib/utils/development"; import useMerkleDistributor from "../useMerkleDistributor"; -import { AirdropBreakdownKeys, GovernanceAirdropInfoData } from "shared/lib/store/types"; +import { + AirdropBreakdownKeys, + GovernanceAirdropInfoData, +} from "shared/lib/store/types"; import { isProduction } from "shared/lib/utils/env"; import ProofData from "./proof-mainnet.json"; import ProofTestnetData from "./proof-testnet.json"; @@ -20,7 +23,7 @@ export type AirdropClaim = { index: number; amount: string; proof: string[]; -} +}; export type AirdropProof = { merkleRoot: string; @@ -34,17 +37,17 @@ export type AirdropBreakdownData = { [address: string]: { rbnAmount: number; heldRbnAfterTGE: boolean; - } + }; }; -const proof = isProduction() - ? ProofData as AirdropProof - : ProofTestnetData as AirdropProof; -const airdropBreakdown = isProduction() - ? BreakdownData as AirdropBreakdownData - : BreakdownTestnetData as AirdropBreakdownData; +const proof = isProduction() + ? (ProofData as AirdropProof) + : (ProofTestnetData as AirdropProof); +const airdropBreakdown = isProduction() + ? (BreakdownData as AirdropBreakdownData) + : (BreakdownTestnetData as AirdropBreakdownData); -const rbnDecimals = getAssetDecimals("RBN") +const rbnDecimals = getAssetDecimals("RBN"); const useAirdrop = () => { const web3Context = useWeb3Wallet(); @@ -54,7 +57,7 @@ const useAirdrop = () => { const [airdropInfo, setAirdropInfo] = useState(); const { pendingTransactions } = usePendingTransactions(); - const [loading, setLoading] = useState(false) + const [loading, setLoading] = useState(false); const updateAirdropInfo = useCallback(async () => { if (chainId !== CHAINID.ETH_MAINNET || !account || !merkleDistributor) { @@ -63,8 +66,8 @@ const useAirdrop = () => { } const airdropClaim = proof["claims"][account]; - const totalBn = BigNumber.from(airdropClaim?.amount || 0) - const total = parseFloat(formatUnits(totalBn, rbnDecimals)) + const totalBn = BigNumber.from(airdropClaim?.amount || 0); + const total = parseFloat(formatUnits(totalBn, rbnDecimals)); if (!airdropClaim || !total) { setAirdropInfo(undefined); @@ -75,7 +78,7 @@ const useAirdrop = () => { try { claimedAmount = await merkleDistributor.claimed(account); } catch (error) { - console.error("Unable to get claimed amount") + console.error("Unable to get claimed amount"); } setAirdropInfo({ @@ -84,17 +87,18 @@ const useAirdrop = () => { proof: { ...airdropClaim, amount: BigNumber.from(airdropClaim.amount) }, breakdown: { [AirdropBreakdownKeys.maxStaked]: !totalBn.isZero(), - [AirdropBreakdownKeys.heldRbnAfterTGE]: airdropBreakdown[account.toLowerCase()]?.heldRbnAfterTGE + [AirdropBreakdownKeys.heldRbnAfterTGE]: + airdropBreakdown[account.toLowerCase()]?.heldRbnAfterTGE, }, - unclaimedAmount: totalBn.sub(claimedAmount) + unclaimedAmount: totalBn.sub(claimedAmount), }); }, [account, merkleDistributor, setAirdropInfo, chainId]); useEffect(() => { if (!airdropInfo || airdropInfo.account !== account) { - setLoading(true) + setLoading(true); updateAirdropInfo().finally(() => { - setLoading(false) + setLoading(false); }); } }, [account, airdropInfo, updateAirdropInfo]); diff --git a/governance/src/hooks/useMerkleDistributor.ts b/governance/src/hooks/useMerkleDistributor.ts index 42dae644..5296e676 100644 --- a/governance/src/hooks/useMerkleDistributor.ts +++ b/governance/src/hooks/useMerkleDistributor.ts @@ -1,7 +1,10 @@ import { useEffect, useState } from "react"; import { useWeb3Wallet } from "shared/lib/hooks/useWeb3Wallet"; -import { MerkleDistributorAdjustable, MerkleDistributorAdjustable__factory } from "shared/lib/codegen"; +import { + MerkleDistributorAdjustable, + MerkleDistributorAdjustable__factory, +} from "shared/lib/codegen"; import deployments from "shared/lib/constants/v1Deployments.json"; import { isProduction } from "shared/lib/utils/env"; diff --git a/shared/src/store/types.ts b/shared/src/store/types.ts index 61a2034e..0121c8a4 100644 --- a/shared/src/store/types.ts +++ b/shared/src/store/types.ts @@ -143,7 +143,7 @@ type CommonMerkleProofData = { amount: BigNumber; proof: string[]; }; -} +}; export type AirdropInfoData = CommonMerkleProofData & { breakdown: { @@ -152,10 +152,9 @@ export type AirdropInfoData = CommonMerkleProofData & { claimed: boolean; }; - export enum AirdropBreakdownKeys { maxStaked = "max_staked_rbn", - heldRbnAfterTGE = "held_after_tge" + heldRbnAfterTGE = "held_after_tge", } export type GovernanceAirdropInfoData = CommonMerkleProofData & {