Skip to content

Commit

Permalink
farm fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@gcadigwe
gcadigwe committed Mar 31, 2023
1 parent 6bb9425 commit 04243dc
Show file tree
Hide file tree
Showing 7 changed files with 1,597 additions and 1,240 deletions.
86 changes: 48 additions & 38 deletions src/pages/FarmingV2/ShowYieldFarmDetails.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ const ShowYieldFarmDetails = ({
const signer = library?.getSigner();
const [reload, setReload] = useState(false);
const [contentid, setContentId] = useState(undefined);
const [loading, setLoading] = useState(false);
const [loading, setLoading] = useState(true);

// const data = useGetFarmData(reload, setReload);

const { loadingState } = useUpdateFarm({ reload, setReload, content });

useFetchYieldFarmDetails({ content, section, setLoading, loading });
useFetchYieldFarmDetails({ content, section, setLoading, loading, reload });

//const {loadingFarm} = useUpdateNewFarm({reload, setReload, content});

Expand Down Expand Up @@ -236,10 +236,10 @@ const ShowYieldFarmDetails = ({
const checkForApproval = async () => {
const rgp = await rigelToken(RGP[chainId as number], library);
const rgpApproval = await poolAllowance(rgp);
if (content.deposit === "RGP" && Number(content.id) === 1) {
if (content.deposit === "RGP" && content.version === "v1") {
const specialPoolV1Approval = await specialPoolV1Allowance(rgp);
changeApprovalButton(true, specialPoolV1Approval);
} else if (content.deposit === "RGP" && Number(content.id) === 13) {
} else if (content.deposit === "RGP" && content.version === "v2") {
const specialPoolV2Approval = await specialPoolV2Allowance(rgp);

changeApprovalButton(true, specialPoolV2Approval);
Expand Down Expand Up @@ -305,6 +305,7 @@ const ShowYieldFarmDetails = ({
message: `Successful RGP Approval`,
})
);
setReload(true);
}
getAllowances();
} catch (error: any) {
Expand Down Expand Up @@ -360,6 +361,7 @@ const ShowYieldFarmDetails = ({
})
);
}
setReload(true);
getAllowances();
} catch (error: any) {
console.error(error);
Expand Down Expand Up @@ -393,11 +395,11 @@ const ShowYieldFarmDetails = ({
};

const checkUser = async (val: string) => {
if (content.deposit === "RGP" && Number(content.id) === 1) {
if (content.deposit === "RGP" && content.version === "v1") {
await RGPSpecialPoolV1Approval();
setApproveValueForOtherToken(true);
setApproveValueForRGP(true);
} else if (content.deposit === "RGP" && Number(content.id) === 13) {
} else if (content.deposit === "RGP" && content.version === "v2") {
await RGPSpecialPoolV2Approval();
setApproveValueForOtherToken(true);
setApproveValueForRGP(true);
Expand Down Expand Up @@ -622,10 +624,11 @@ const ShowYieldFarmDetails = ({
);

if (account) {
if (val === "RGP" && Number(content.id) === 1) {
await RGPUnstake(val);
} else if (val === "RGP" && Number(content.id) === 13) {
await RGPUnstakeV2(val);
console.log("id", content.id);
if (val === "RGP" && content?.version === "v1") {
await RGPUnstake(RGPSPECIALPOOLADDRESSES[chainId as number]);
} else if (val === "RGP" && content?.version === "v2") {
await RGPUnstake(RGPSPECIALPOOLADDRESSES2[chainId as number]);
} else {
tokensWithdrawal(content.id, val);
}
Expand Down Expand Up @@ -959,9 +962,9 @@ const ShowYieldFarmDetails = ({
: ethers.utils.parseUnits(format3, 9).toString(),
}
);
const { confirmations, status, logs } = await fetchTransactionData(
data
);
const receipt = await data.wait(3);
setDeposited(true);
setReload(!reload);
GFarmingSuccessTransaction("farming", "stake", val, "v2");
dispatch(
setOpenModal({
Expand All @@ -972,7 +975,6 @@ const ShowYieldFarmDetails = ({

//callRefreshFarm(confirmations, status);
//temporal
setDeposited(true);
}
} else {
const lpTokens = await MasterChefV2Contract(
Expand Down Expand Up @@ -1017,9 +1019,10 @@ const ShowYieldFarmDetails = ({
message: `Successfully deposited`,
})
);
setReload(!reload);
GFarmingSuccessTransaction("farming", "stake", val, "v2");
setDeposited(true);
setReload(true);

setContentId(content.deposit === "RGP" ? undefined : content.id);
// callRefreshFarm(confirmations, status);
}
Expand All @@ -1045,11 +1048,12 @@ const ShowYieldFarmDetails = ({
);
try {
if (account) {
if (val === "RGP" && Number(content.id) === 1) {
await RGPuseStake();
} else if (val === "RGP" && Number(content.id) === 13) {
await RGPuseStakeV2();
if (val === "RGP" && content?.version === "v1") {
await RGPuseStakeV2(RGPSPECIALPOOLADDRESSES[chainId as number]);
} else if (val === "RGP" && content?.version === "v2") {
await RGPuseStakeV2(RGPSPECIALPOOLADDRESSES2[chainId as number]);
} else {
console.log("deposit lp");
LPDeposit(content.id, val);
}
}
Expand Down Expand Up @@ -1132,13 +1136,10 @@ const ShowYieldFarmDetails = ({
}
}
};
const RGPuseStakeV2 = async () => {
const RGPuseStakeV2 = async (poolAddress: string) => {
if (account) {
try {
const specialPool = await RGPSpecialPool2(
RGPSPECIALPOOLADDRESSES2[chainId as number],
library
);
const specialPool = await RGPSpecialPool2(poolAddress, library);
GFarmingSpecialPoolReferral(
referrerAddress === ZERO_ADDRESS ? false : true
);
Expand Down Expand Up @@ -1184,13 +1185,10 @@ const ShowYieldFarmDetails = ({
};

// withdrawal of funds
const RGPUnstake = async () => {
const RGPUnstake = async (poolAddress: string) => {
if (account) {
try {
const specialPool = await RGPSpecialPool(
RGPSPECIALPOOLADDRESSES[chainId as number],
library
);
const specialPool = await RGPSpecialPool(poolAddress, library);
const { format1, format2, format3 } = await calculateGas(
userGasPricePercentage,
library,
Expand Down Expand Up @@ -1219,14 +1217,23 @@ const ShowYieldFarmDetails = ({
}
);
const { confirmations, status } = await fetchTransactionData(data);
GFarmingSuccessTransaction("special pool", "unstake", "RGP", "v1");
dispatch(
setOpenModal({
trxState: TrxState.TransactionSuccessful,
message: `Successfully unstaked ${unstakeToken} RGP `,
})
);
refreshSpecialData();
if (confirmations > 1) {
GFarmingSuccessTransaction(
"special pool",
"unstake",
"RGP",
content?.version
);
dispatch(
setOpenModal({
trxState: TrxState.TransactionSuccessful,
message: `Successfully unstaked ${unstakeToken} RGP `,
})
);

refreshSpecialData();
setReload(true);
}
// dispatch the getTokenStaked action from here when data changes
// callRefreshFarm(confirmations, status);
} catch (e: any) {
Expand Down Expand Up @@ -2382,7 +2389,10 @@ const ShowYieldFarmDetails = ({
? { background: "rgba(64, 186, 213, 0.15)" }
: { background: "#444159" }
}
onClick={() => confirmDeposit(content.deposit)}
onClick={() => {
console.log("confirm");
confirmDeposit(content.deposit);
}}
>
{depositValue}
</Button>
Expand Down
74 changes: 40 additions & 34 deletions src/pages/FarmingV2/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@ import {
useFetchFarm,
useFetchQuickSwap,
useFetchStable,
useSpecialPool,
} from "../../utils/hooks/useFarm";

export const BIG_TEN = new bigNumber(10);
Expand Down Expand Up @@ -166,9 +167,10 @@ export function Index() {

const farms = useSelector((state: any) => state.farms);

useFetchFarm();
useFetchQuickSwap();
useFetchStable();
const { loading: LpfarmLoading } = useFetchFarm();
const { loading: quickswapLoading } = useFetchQuickSwap();
const { loading: stableFarmLoading } = useFetchStable();
useSpecialPool();

useEffect(() => {
if (location && location.includes("RGPv2")) {
Expand Down Expand Up @@ -618,7 +620,7 @@ export function Index() {
<TabPanel px={0} py={"40px"}>
<FarmHeader />
<Box mx='auto' w={["100%", "100%", "100%"]} pb='70px'>
{loadingState ? (
{LpfarmLoading ? (
<Stack mt={2}>
{new Array(4).fill("1").map((item, index) => {
return (
Expand Down Expand Up @@ -668,7 +670,7 @@ export function Index() {
refreshSpecialData={refreshSpecialData}
section={"normal"}
wallet={wallet}
LoadingState={loadingState}
LoadingState={LpfarmLoading}
/>
))
)}
Expand Down Expand Up @@ -808,8 +810,8 @@ export function Index() {
<TabPanels>
<TabPanel px={0} py={"40px"}>
<FarmHeader />
<Text>Special pool</Text>
{/* {specialPool?.map((content: any, index: number) => (

{farms?.SpecialPool?.map((content: any, index: number) => (
<YieldFarm
farmDataLoading={farmDataLoading}
content={content}
Expand All @@ -818,7 +820,7 @@ export function Index() {
wallet={wallet}
URLReferrerAddress={refAddress}
/>
))} */}
))}
</TabPanel>
</TabPanels>
</Tabs>
Expand Down Expand Up @@ -1052,7 +1054,7 @@ export function Index() {
<Text />
</Flex>

{loadingLP ? (
{quickswapLoading ? (
<Stack mt={2}>
{new Array(4).fill("1").map((item, index) => {
return (
Expand Down Expand Up @@ -1101,18 +1103,20 @@ export function Index() {
);
})}
</Stack>
) : null}

{/* <YieldFarm
farmDataLoading={farmDataLoading}
content2={content}
key={content?.id}
section={"normal"}
wallet={wallet}
LoadingState={loadingLP}
contractID={1}
refreshSpecialData={refreshSpecialData}
/> */}
) : (
farms?.QuickswapFarm.map((content: any) => (
<YieldFarm
farmDataLoading={farmDataLoading}
content2={content}
key={content?.id}
section={"normal"}
wallet={wallet}
LoadingState={quickswapLoading}
contractID={1}
refreshSpecialData={refreshSpecialData}
/>
))
)}
</Box>
</Box>
</Flex>
Expand Down Expand Up @@ -1193,7 +1197,7 @@ export function Index() {
<Text />
</Flex>

{loadingLP ? (
{stableFarmLoading ? (
<Stack mt={2}>
{new Array(4).fill("1").map((item, index) => {
return (
Expand Down Expand Up @@ -1242,18 +1246,20 @@ export function Index() {
);
})}
</Stack>
) : null}

{/* <YieldFarm
farmDataLoading={farmDataLoading}
content2={content}
key={content?.id}
section={"normal"}
wallet={wallet}
LoadingState={loadingLP}
refreshSpecialData={refreshSpecialData}
contractID={2}
/> */}
) : (
farms?.StableFarm.map((content: any) => (
<YieldFarm
farmDataLoading={farmDataLoading}
content2={content}
key={content?.id}
section={"normal"}
wallet={wallet}
LoadingState={stableFarmLoading}
refreshSpecialData={refreshSpecialData}
contractID={2}
/>
))
)}
</Box>
</Box>
</Flex>
Expand Down

0 comments on commit 04243dc

Please sign in to comment.